Fixes to support fog-openstack-1.x

fog-openstack-1.x already appends "auth/tokens" so we no longer need to
do that.  In addition, comment out endpoint type until this PR [1] gets
merged and released.

[1] https://github.com/fog/fog-openstack/pull/494

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

recipes/identity_registration.rb

@@ -47,15 +47,17 @@ service_user =
 service_role = node['openstack']['image']['service_role']
 service_domain_name = node['openstack']['image_api']['conf']['keystone_authtoken']['user_domain_name']
 region = node['openstack']['region']
-endpoint_type = node['openstack']['identity']['endpoint_type']
+# TODO(ramereth): commenting this out until
+# https://github.com/fog/fog-openstack/pull/494 gets merged and released.
+# endpoint_type = node['openstack']['identity']['endpoint_type']
 
 connection_params = {
-  openstack_auth_url:      "#{auth_url}/auth/tokens",
+  openstack_auth_url:      auth_url,
   openstack_username:      admin_user,
   openstack_api_key:       admin_pass,
   openstack_project_name:  admin_project,
   openstack_domain_name:   admin_domain,
-  openstack_endpoint_type: endpoint_type,
+  # openstack_endpoint_type: endpoint_type,
 }
 
 # Register Image Service

spec/identity_registration_spec.rb

@@ -11,12 +11,12 @@ describe 'openstack-image::identity_registration' do
   include_context 'image-stubs'
 
   connection_params = {
-    openstack_auth_url: 'http://127.0.0.1:5000/v3/auth/tokens',
+    openstack_auth_url: 'http://127.0.0.1:5000/v3',
     openstack_username: 'admin',
     openstack_api_key: 'admin-pass',
     openstack_project_name: 'admin',
     openstack_domain_name: 'default',
-    openstack_endpoint_type: 'internalURL',
+    # openstack_endpoint_type: 'internalURL',
   }
   service_name = 'glance'
   service_type = 'image'