From 9f7b019ada91d56d22418f68085e5ceb5ba70e5d Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Mon, 24 Aug 2020 08:49:53 -0700 Subject: [PATCH] Chef 16 updates Depends-On: https://review.opendev.org/747752 Depends-On: https://review.opendev.org/747557 Change-Id: I986de1516de71ff578cb8c9e70f8afb49c0347e9 Signed-off-by: Lance Albertson --- README.rst | 2 +- recipes/setup.rb | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 6ec0ca4..ced4b00 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) Cookbooks diff --git a/recipes/setup.rb b/recipes/setup.rb index e0501c3..ee8a421 100644 --- a/recipes/setup.rb +++ b/recipes/setup.rb @@ -18,8 +18,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -require 'uri' - class Chef::Recipe include ::Openstack end @@ -37,7 +35,7 @@ package platform_options['tempest_packages'] do end identity_endpoint = internal_endpoint 'identity' -auth_url = ::URI.decode identity_endpoint.to_s +auth_url = identity_endpoint.to_s admin_user = node['openstack']['identity']['admin_user'] admin_pass = get_password 'user', admin_user