diff --git a/recipes/setup.rb b/recipes/setup.rb
index e4eaf3d..8e2271a 100644
--- a/recipes/setup.rb
+++ b/recipes/setup.rb
@@ -45,16 +45,17 @@ admin_pass = get_password 'user', admin_user
 admin_project = node['openstack']['identity']['admin_project']
 admin_domain = node['openstack']['identity']['admin_domain_name']
 admin_project_domain_name = node['openstack']['identity']['admin_project_domain']
-
-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,
 }
 
 %w(user1 user2).each_with_index do |user|
@@ -152,7 +153,7 @@ node.default['openstack']['integration-test']['conf'].tap do |conf|
   conf['compute']['image_ref'] = node['openstack']['integration-test']['image1']['id']
   conf['compute']['image_ref_alt'] = node['openstack']['integration-test']['image2']['id']
   conf['identity']['uri_v3'] = identity_endpoint.to_s
-  conf['identity']['v3_endpoint_type'] = endpoint_type
+  # conf['identity']['v3_endpoint_type'] = endpoint_type
 end
 
 node.default['openstack']['integration-test']['conf_secrets'].tap do |conf_secrets|
diff --git a/spec/setup_spec.rb b/spec/setup_spec.rb
index 0b57052..7210cd8 100644
--- a/spec/setup_spec.rb
+++ b/spec/setup_spec.rb
@@ -12,12 +12,12 @@ describe 'openstack-integration-test::setup' do
     include_context 'tempest-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_name: 'default',
-      openstack_endpoint_type: 'internalURL',
+      # openstack_endpoint_type: 'internalURL',
     }
 
     it 'installs tempest dependencies' do
@@ -174,11 +174,11 @@ describe 'openstack-integration-test::setup' do
         )
       end
 
-      it 'has an endpoint type matching the default value' do
-        expect(chef_run).to render_file(file.name).with_content(
-          'endpoint_type = internalURL'
-        )
-      end
+      # it 'has an endpoint type matching the default value' do
+      #   expect(chef_run).to render_file(file.name).with_content(
+      #     'endpoint_type = internalURL'
+      #   )
+      # end
 
       it 'discovers compute hosts' do
         expect(chef_run).to run_execute('discover_hosts')