From 8fa848fb5162ae53a416b65d0b31e5678d81a965 Mon Sep 17 00:00:00 2001 From: Luka Peschke Date: Mon, 28 Nov 2016 16:28:44 +0100 Subject: [PATCH] Use os_project name in get_client The cloudkitty Client object cannot authenticate into keystone if 'os_project_name' is passed as parameter instead of 'os_tenant_name'. It is the same if 'os_project_id' is passed instead of 'os_tenant_id'. This patch fixes both of these issues. Change-Id: Ife248e87e1126d101be5e4550b933e66eccadbb9 --- cloudkittyclient/client.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cloudkittyclient/client.py b/cloudkittyclient/client.py index a51925c..6fb46f8 100644 --- a/cloudkittyclient/client.py +++ b/cloudkittyclient/client.py @@ -306,8 +306,10 @@ def get_client(version, **kwargs): cli_kwargs = { 'username': kwargs.get('os_username'), 'password': kwargs.get('os_password'), - 'tenant_id': kwargs.get('os_tenant_id'), - 'tenant_name': kwargs.get('os_tenant_name'), + 'tenant_id': (kwargs.get('os_tenant_id') + 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'), 'region_name': kwargs.get('os_region_name'), 'service_type': kwargs.get('os_service_type'), @@ -339,7 +341,7 @@ def get_auth_plugin(endpoint, **kwargs): endpoint=endpoint, username=kwargs.get('username'), 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_id=kwargs.get('user_domain_id'), project_domain_name=kwargs.get('project_domain_name'),