openstack/python-cloudkittyclient
Code Issues Proposed changes

Merge "Use os_project name in get_client"

Browse Source
This commit is contained in:
Jenkins
2016-11-29 14:10:12 +00:00
committed by Gerrit Code Review
parent ddf93becc1 8fa848fb51
commit 70cef21224
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cloudkittyclient/client.py
View File

@@ -306,8 +306,10 @@ def get_client(version, **kwargs):
cli_kwargs = { cli_kwargs = {
'username': kwargs.get('os_username'), 'username': kwargs.get('os_username'),
'password': kwargs.get('os_password'), 'password': kwargs.get('os_password'),
'tenant_id': kwargs.get('os_tenant_id'), 'tenant_id': (kwargs.get('os_tenant_id')
'tenant_name': kwargs.get('os_tenant_name'), or kwargs.get('os_project_id')),
'tenant_name': (kwargs.get('os_tenant_name')
or kwargs.get('os_project_name')),
'auth_url': kwargs.get('os_auth_url'), 'auth_url': kwargs.get('os_auth_url'),
'region_name': kwargs.get('os_region_name'), 'region_name': kwargs.get('os_region_name'),
'service_type': kwargs.get('os_service_type'), 'service_type': kwargs.get('os_service_type'),
@@ -339,7 +341,7 @@ def get_auth_plugin(endpoint, **kwargs):
endpoint=endpoint, endpoint=endpoint,
username=kwargs.get('username'), username=kwargs.get('username'),
password=kwargs.get('password'), password=kwargs.get('password'),
tenant_name=kwargs.get('tenant_name'), tenant_name=kwargs.get('tenant_name') or kwargs.get('project_name'),
user_domain_name=kwargs.get('user_domain_name'), user_domain_name=kwargs.get('user_domain_name'),
user_domain_id=kwargs.get('user_domain_id'), user_domain_id=kwargs.get('user_domain_id'),
project_domain_name=kwargs.get('project_domain_name'), project_domain_name=kwargs.get('project_domain_name'),