Chef 16 updates

Depends-On: https://review.opendev.org/747556
Change-Id: Ic4ddb3c0f4b840578ee074c1279330db5822bfa3
Signed-off-by: Lance Albertson <lance@osuosl.org>

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

recipes/common.rb

@@ -56,8 +56,8 @@ api_bind = bind_services['orchestration-api']
 api_cfn_bind = bind_services['orchestration-api-cfn']
 api_cfn_endpoint = internal_endpoint 'orchestration-api-cfn'
 
-ec2_auth_uri = ::URI.decode identity_endpoint.to_s
-auth_uri = ::URI.decode identity_endpoint.to_s
+ec2_auth_uri = identity_endpoint.to_s
+auth_uri = identity_endpoint.to_s
 base_auth_uri = public_endpoint 'identity'
 base_auth_uri.path = '/'
 

recipes/identity_registration.rb

@@ -19,15 +19,12 @@
 # limitations under the License.
 #
 
-require 'uri'
-
 class ::Chef::Recipe
   include ::Openstack
 end
 
 identity_endpoint = public_endpoint 'identity'
-
-auth_url = ::URI.decode identity_endpoint.to_s
+auth_url = identity_endpoint.to_s
 
 internal_heat_endpoint = internal_endpoint 'orchestration-api'
 public_heat_endpoint = public_endpoint 'orchestration-api'
@@ -67,7 +64,7 @@ openstack_service service_name do
 end
 
 # Register Orchestration Public-Endpoint
-openstack_endpoint service_type do # ~FC005
+openstack_endpoint service_type do
   service_name service_name
   interface 'public'
   url public_heat_endpoint.to_s
@@ -122,7 +119,7 @@ openstack_service 'heat-cfn' do
 end
 
 # Register Heat API CloudFormation Public-Endpoint
-openstack_endpoint 'cloudformation' do # ~FC005
+openstack_endpoint 'cloudformation' do
   service_name 'heat-cfn'
   interface 'public'
   url public_heat_cfn_endpoint.to_s