From 878aa8797111325aff423d9b4c6dbc5f83eff1f8 Mon Sep 17 00:00:00 2001
From: Lance Albertson <lance@osuosl.org>
Date: Sat, 22 Aug 2020 21:09:41 -0700
Subject: [PATCH] Chef 16 updates

Depends-On: https://review.opendev.org/749849
Change-Id: I80dd2cfd30d62ee1a7b8a261504b3a909e5c636c
Signed-off-by: Lance Albertson <lance@osuosl.org>
---
 README.rst                       | 2 +-
 metadata.rb                      | 2 +-
 recipes/api.rb                   | 3 +--
 recipes/identity_registration.rb | 4 +---
 recipes/image_upload.rb          | 2 +-
 recipes/swift_store.rb           | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 55552cd..ed2c9ac 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,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 96d6061..ac825ef 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      'Installs and configures the Glance Image Registry and Delivery Service'
-version          '19.0.0'
+version          '19.1.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
diff --git a/recipes/api.rb b/recipes/api.rb
index bbd50b8..325b9b8 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -20,7 +20,6 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-require 'uri'
 
 class ::Chef::Recipe
   include ::Openstack
@@ -63,7 +62,7 @@ node.default['openstack']['image_api']['conf_secrets']
   get_password 'service', 'openstack-image'
 
 identity_endpoint = internal_endpoint 'identity'
-auth_url = ::URI.decode identity_endpoint.to_s
+auth_url = identity_endpoint.to_s
 
 db_user = node['openstack']['db']['image']['username']
 db_pass = get_password 'db', 'glance'
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 996e2a0..32c9a74 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -21,14 +21,12 @@
 # limitations under the License.
 #
 
-require 'uri'
-
 class ::Chef::Recipe
   include ::Openstack
 end
 
 identity_endpoint = internal_endpoint 'identity'
-auth_url = ::URI.decode identity_endpoint.to_s
+auth_url = identity_endpoint.to_s
 
 interfaces = {
   public: { url: public_endpoint('image_api') },
diff --git a/recipes/image_upload.rb b/recipes/image_upload.rb
index 678d629..ed2dcf0 100644
--- a/recipes/image_upload.rb
+++ b/recipes/image_upload.rb
@@ -33,7 +33,7 @@ package 'curl' do
 end
 
 identity_endpoint = public_endpoint 'identity'
-auth_url = ::URI.decode identity_endpoint.to_s
+auth_url = identity_endpoint.to_s
 
 # admin_user = node['openstack']['image_api']['conf']['keystone_authtoken']['username']
 # admin_pass = get_password admin_user, admin_pass
diff --git a/recipes/swift_store.rb b/recipes/swift_store.rb
index d70d7ef..9ae074d 100644
--- a/recipes/swift_store.rb
+++ b/recipes/swift_store.rb
@@ -29,7 +29,7 @@ platform_options['swift_packages'].each do |pkg|
 end
 
 identity_endpoint = public_endpoint 'identity'
-swift_store_auth_address = ::URI.decode identity_endpoint.to_s
+swift_store_auth_address = identity_endpoint.to_s
 tenant = node['openstack']['image_api']['conf']['keystone_authtoken']['project']
 user = node['openstack']['image_api']['conf']['keystone_authtoken']['user']
 swift_store_user =  "#{tenant}_#{user}"