From 83b8d6d116bad522161b56e54dff1b7398c47b1d Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 28 Apr 2015 12:09:01 +1000 Subject: [PATCH] Don't use scoping information for admin auth The only place that admin_auth seems to be used here is gaining the user_id for establishing a trust. Fetching a token for only the user_id is not an operation that requires scoping to a project so request an unscoped token here. Change-Id: Id7c30ec2340addb30d5bd463891c9fdd9280009e --- heat/common/heat_keystoneclient.py | 4 +--- heat/tests/test_heatclient.py | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py index 30be87208d..e8074bdc36 100644 --- a/heat/common/heat_keystoneclient.py +++ b/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 diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index 358f4884c5..6e564a5fa1 100644 --- a/heat/tests/test_heatclient.py +++ b/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)