openstack/deb-murano
Code Issues Proposed changes

Replace tenant_id with project_id in auth_utils

Browse Source 
The 'tenant_id' passing to keystoneclient.v3.client.Client is
deprecated, and may be removed in the 2.0.0 release[1]. Replace
it with 'project_id' as suggested.

[1]:
f8c47a1aa0/keystoneclient/v3/client.py (L73)

Change-Id: I2898bb10e4373916b06c90b6b18ceb65845ae3b7
Related-Bug: #1514756
This commit is contained in:
liyingjun
2015-12-24 17:22:18 +08:00
parent 6b9145f6e9
commit ab32ce73f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
murano/common/auth_utils.py
View File

@@ -18,11 +18,11 @@ from oslo_config import cfg
from oslo_utils import importutils from oslo_utils import importutils
def get_client(token, tenant_id): def get_client(token, project_id):
settings = _get_keystone_settings() settings = _get_keystone_settings()
kwargs = { kwargs = {
'token': token, 'token': token,
'tenant_id': tenant_id, 'project_id': project_id,
'auth_url': settings['auth_url'] 'auth_url': settings['auth_url']
} }
kwargs.update(settings['ssl']) kwargs.update(settings['ssl'])
@@ -65,8 +65,8 @@ def get_client_for_trusts(trust_id):
return _admin_client(trust_id) return _admin_client(trust_id)
def create_trust(token, tenant_id): def create_trust(token, project_id):
client = get_client(token, tenant_id) client = get_client(token, project_id)
settings = _get_keystone_settings() settings = _get_keystone_settings()
trustee_id = get_client_for_admin( trustee_id = get_client_for_admin(
@@ -77,7 +77,7 @@ def create_trust(token, tenant_id):
trustee_user=trustee_id, trustee_user=trustee_id,
impersonation=True, impersonation=True,
role_names=roles, role_names=roles,
project=tenant_id) project=project_id)
return trust.id return trust.id