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: I2a73e87648bff58180c6ee2355a733a8e030fa4b
Signed-off-by: Lance Albertson <lance@osuosl.org>

recipes/registration.rb

@@ -43,15 +43,17 @@ admin_domain = node['openstack']['identity']['admin_domain_name']
 # endpoint type to use when creating resources
 # NOTE(frickler): fog-openstack defaults to the 'admin' endpoint for
 # Identity operations, so we need to override this after we dropped that one
-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_id:     admin_domain,
-  openstack_endpoint_type: endpoint_type,
+  # openstack_endpoint_type: endpoint_type,
 }
 
 ruby_block 'wait for identity endpoint' do

spec/registration_spec.rb

@@ -12,12 +12,12 @@ describe 'openstack-identity::registration' do
     include_context 'identity_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',
       openstack_project_name: 'admin',
       openstack_domain_id: 'default',
-      openstack_endpoint_type: 'internalURL',
+      # openstack_endpoint_type: 'internalURL',
     }
 
     describe 'keystone bootstrap' do