diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-29 02:41:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-29 02:41:26 +0000 |
| commit | 47262c079d0e0f1dbdeaeb071acb1dc8317a5723 (patch) | |
| tree | 97759fd64f291a0113a344e9eaf3782b49527564 /contrib | |
| parent | 26aea2632c3640c8e942bae5a4ac846f6907d467 (diff) | |
| parent | 87a37f5db26b7cf6cc1e6240a7ebef4900983825 (diff) | |
| download | heat-47262c079d0e0f1dbdeaeb071acb1dc8317a5723.tar.gz | |
Merge "Sync context with oslo.context"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/rackspace/heat_keystoneclient_v2/client.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/rackspace/heat_keystoneclient_v2/client.py b/contrib/rackspace/heat_keystoneclient_v2/client.py index 64f028e5d..c7b6d8b14 100644 --- a/contrib/rackspace/heat_keystoneclient_v2/client.py +++ b/contrib/rackspace/heat_keystoneclient_v2/client.py @@ -92,12 +92,12 @@ class KeystoneClientV2(object): auth_kwargs['trust_id'] = self.context.trust_id auth_kwargs['tenant_id'] = self.context.tenant_id elif self.context.auth_token is not None: - kwargs['tenant_name'] = self.context.tenant + kwargs['tenant_name'] = self.context.project_name kwargs['token'] = self.context.auth_token elif self.context.password is not None: kwargs['username'] = self.context.username kwargs['password'] = self.context.password - kwargs['tenant_name'] = self.context.tenant + kwargs['tenant_name'] = self.context.project_name kwargs['tenant_id'] = self.context.tenant_id else: LOG.error(_LE("Keystone v2 API connection failed, no password " |