Merge "cloudkittyclient with keystone v3 not working"

This commit is contained in:
Jenkins 2016-03-04 14:08:52 +00:00 committed by Gerrit Code Review
commit 336f1466e0

View File

@ -105,6 +105,8 @@ def _get_keystone_session(**kwargs):
user_id=user_id,
user_domain_name=user_domain_name,
user_domain_id=user_domain_id,
project_name=project_name,
project_id=project_id,
project_domain_name=project_domain_name,
project_domain_id=project_domain_id)
elif use_v2:
@ -145,7 +147,8 @@ class AuthPlugin(auth.BaseAuthPlugin):
'service_type', 'endpoint_type', 'cacert',
'auth_url', 'insecure', 'cert_file', 'key_file',
'cert', 'key', 'tenant_name', 'project_name',
'project_id', 'user_domain_id', 'user_domain_name',
'project_id', 'project_domain_id', 'project_domain_name',
'user_id', 'user_domain_id', 'user_domain_name',
'password', 'username', 'endpoint']
def __init__(self, auth_system=None, **kwargs):