From 9a53630c9272f2ce74ed3b03683b5a1e34c1569a Mon Sep 17 00:00:00 2001 From: Lance Albertson Date: Sat, 22 Aug 2020 21:08:07 -0700 Subject: [PATCH] Chef 16 updates Depends-On: https://review.opendev.org/749561 Depends-On: https://review.opendev.org/749819 Depends-On: https://review.opendev.org/749823 Depends-On: https://review.opendev.org/749826 Depends-On: https://review.opendev.org/749828 Change-Id: I5a44866c513a2d0936db57df2852bdeb892feb64 Signed-off-by: Lance Albertson --- README.rst | 2 +- metadata.rb | 2 +- recipes/cloud_config.rb | 2 +- recipes/openrc.rb | 2 +- recipes/registration.rb | 3 +-- recipes/server-apache.rb | 2 -- spec/server-apache_spec.rb | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index 0b318e5..d0f398f 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ Requirements ============ - Chef 15 or higher -- Chef Workstation 0.15.18 for testing (also includes Berkshelf for +- Chef Workstation 20.8.111 for testing (also includes Berkshelf for cookbook dependency resolution) Platform diff --git a/metadata.rb b/metadata.rb index 2abfed4..f4c31ef 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer 'openstack-chef' maintainer_email 'openstack-discuss@lists.openstack.org' license 'Apache-2.0' description 'The OpenStack Identity service Keystone.' -version '19.0.0' +version '19.1.0' %w(ubuntu redhat centos).each do |os| supports os diff --git a/recipes/cloud_config.rb b/recipes/cloud_config.rb index f57039d..809583e 100644 --- a/recipes/cloud_config.rb +++ b/recipes/cloud_config.rb @@ -32,7 +32,7 @@ admin_domain_name = node['openstack']['identity']['admin_domain_name'] ksadmin_pass = get_password 'user', ksadmin_user identity_endpoint = public_endpoint 'identity' -auth_url = ::URI.decode identity_endpoint.to_s +auth_url = identity_endpoint.to_s cloud_config = node['openstack']['identity']['cloud_config'] diff --git a/recipes/openrc.rb b/recipes/openrc.rb index ba9d026..b2bbba0 100644 --- a/recipes/openrc.rb +++ b/recipes/openrc.rb @@ -32,7 +32,7 @@ admin_domain_name = node['openstack']['identity']['admin_domain_name'] ksadmin_pass = get_password 'user', ksadmin_user identity_endpoint = public_endpoint 'identity' -auth_url = ::URI.decode identity_endpoint.to_s +auth_url = identity_endpoint.to_s openrc_config = node['openstack']['identity']['openrc'] diff --git a/recipes/registration.rb b/recipes/registration.rb index cf73a30..baf123d 100644 --- a/recipes/registration.rb +++ b/recipes/registration.rb @@ -24,7 +24,6 @@ # inside of this cookbook. The recipe is documented in detail with inline # comments inside the recipe. -require 'uri' require 'chef/mixin/shell_out' class ::Chef::Recipe @@ -33,7 +32,7 @@ end identity_endpoint = public_endpoint 'identity' identity_internal_endpoint = internal_endpoint 'identity' -auth_url = ::URI.decode identity_internal_endpoint.to_s +auth_url = identity_internal_endpoint.to_s # define the credentials to use for the initial admin user admin_project = node['openstack']['identity']['admin_project'] diff --git a/recipes/server-apache.rb b/recipes/server-apache.rb index 5207b28..05533ce 100644 --- a/recipes/server-apache.rb +++ b/recipes/server-apache.rb @@ -22,8 +22,6 @@ # inside of an apache webserver. The recipe is documented in detail with inline # comments inside the recipe. -require 'uri' - # load the methods defined in cookbook-openstack-common libraries class ::Chef::Recipe include ::Openstack diff --git a/spec/server-apache_spec.rb b/spec/server-apache_spec.rb index 46f0341..61e679c 100644 --- a/spec/server-apache_spec.rb +++ b/spec/server-apache_spec.rb @@ -321,7 +321,7 @@ describe 'openstack-identity::server-apache' do end it do - expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:5000') + expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:5000)) end it do