openstack
/
heat
Code Issues Proposed changes

heat_keystoneclient don't pass project and trust_id 

When creating a keystoneclient connection with a trust, we should
not pass the project_name, as the token can only be scoped to either
a trust or project, not both.  Previous versions of keystoneclient
worked with both, but recent changes mean this no longer works.

Change-Id: I5c7e7498137d428360f2b5f1e8bd2d079c80cd9b
Closes-Bug: #1288223
This commit is contained in:
Steven Hardy 2014-03-06 09:52:39 +00:00
parent 362e0332ca
commit 3447a222bd
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
heat/common/heat_keystoneclient.py
View File

@ -150,6 +150,7 @@ class KeystoneClientV3(object):
# trust impersonating the trustor user.
kwargs.update(self._service_admin_creds())
kwargs['trust_id'] = self.context.trust_id
kwargs.pop('project_name')
elif self.context.auth_token is not None:
kwargs['project_name'] = self.context.tenant
kwargs['token'] = self.context.auth_token

1
heat/tests/test_heatclient.py
View File

@ -114,7 +114,6 @@ class KeystoneClientTest(HeatTestCase):
kc_v3.Client(
username='heat',
password='verybadpass',
project_name='service',
auth_url='http://server.test:5000/v3',
endpoint='http://server.test:5000/v3',
trust_id='atrust123',