Merge "Don't use scoping information for admin auth"

heat/common/heat_keystoneclient.py

@@ -127,9 +127,7 @@ class KeystoneClientV3(object):
                 username=cfg.CONF.keystone_authtoken.admin_user,
                 password=cfg.CONF.keystone_authtoken.admin_password,
                 user_domain_id='default',
-                auth_url=self.v3_endpoint,
-                project_name=cfg.CONF.keystone_authtoken.admin_tenant_name,
-                project_domain_id='default')
+                auth_url=self.v3_endpoint)
 
         return self._admin_auth
 

heat/tests/test_heatclient.py

@@ -81,8 +81,6 @@ class KeystoneClientTest(common.HeatTestCase):
         m = ks_auth_v3.Password(auth_url='http://server.test:5000/v3',
                                 password='verybadpass',
                                 user_domain_id='default',
-                                project_name='service',
-                                project_domain_id='default',
                                 username='heat')
         m.AndReturn(mock_ks_auth)