Merge "cloudkittyclient with keystone v3 not working"
This commit is contained in:
@@ -105,6 +105,8 @@ def _get_keystone_session(**kwargs):
|
|||||||
user_id=user_id,
|
user_id=user_id,
|
||||||
user_domain_name=user_domain_name,
|
user_domain_name=user_domain_name,
|
||||||
user_domain_id=user_domain_id,
|
user_domain_id=user_domain_id,
|
||||||
|
project_name=project_name,
|
||||||
|
project_id=project_id,
|
||||||
project_domain_name=project_domain_name,
|
project_domain_name=project_domain_name,
|
||||||
project_domain_id=project_domain_id)
|
project_domain_id=project_domain_id)
|
||||||
elif use_v2:
|
elif use_v2:
|
||||||
@@ -145,7 +147,8 @@ class AuthPlugin(auth.BaseAuthPlugin):
|
|||||||
'service_type', 'endpoint_type', 'cacert',
|
'service_type', 'endpoint_type', 'cacert',
|
||||||
'auth_url', 'insecure', 'cert_file', 'key_file',
|
'auth_url', 'insecure', 'cert_file', 'key_file',
|
||||||
'cert', 'key', 'tenant_name', 'project_name',
|
'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']
|
'password', 'username', 'endpoint']
|
||||||
|
|
||||||
def __init__(self, auth_system=None, **kwargs):
|
def __init__(self, auth_system=None, **kwargs):
|
||||||
|
Reference in New Issue
Block a user