diff --git a/README.rst b/README.rst index 0ab42a2..0aaae84 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Requirements ============ - Chef 15 or higher -- Chef Workstation 0.18.3 for testing (also includes Berkshelf for +- Chef Workstation 20.8.111 for testing (also includes Berkshelf for cookbook dependency resolution) Platform diff --git a/recipes/apache2-server.rb b/recipes/apache2-server.rb index 95039c6..4fdb64f 100644 --- a/recipes/apache2-server.rb +++ b/recipes/apache2-server.rb @@ -23,8 +23,6 @@ # limitations under the License. # -require 'uri' - class ::Chef::Recipe include ::Openstack include Apache2::Cookbook::Helpers diff --git a/recipes/horizon.rb b/recipes/horizon.rb index 95af2dd..e2a39f9 100644 --- a/recipes/horizon.rb +++ b/recipes/horizon.rb @@ -23,8 +23,6 @@ # limitations under the License. # -require 'uri' - class ::Chef::Recipe include ::Openstack end @@ -32,7 +30,7 @@ end platform_options = node['openstack']['dashboard']['platform'] identity_endpoint = internal_endpoint 'identity' -auth_url = ::URI.decode identity_endpoint.to_s +auth_url = identity_endpoint.to_s http_bind = node['openstack']['bind_service']['dashboard_http'] http_bind_address = bind_address http_bind