Merge "Fix error in credential_factory"

This commit is contained in:
Jenkins 2017-06-14 20:45:40 +00:00 committed by Gerrit Code Review
commit 5d2280ae3d

View File

@ -140,8 +140,8 @@ def credential_factory(conf=None, context=None):
domain_name=conf.key_manager.domain_name, domain_name=conf.key_manager.domain_name,
project_id=conf.key_manager.project_id, project_id=conf.key_manager.project_id,
project_name=conf.key_manager.project_name, project_name=conf.key_manager.project_name,
project_domain_id=conf.key_manager.domain_id, project_domain_id=conf.key_manager.project_domain_id,
project_domain_name=conf.key_manager.domain_name, project_domain_name=conf.key_manager.project_domain_name,
reauthenticate=conf.key_manager.reauthenticate) reauthenticate=conf.key_manager.reauthenticate)
elif conf.key_manager.auth_type == 'keystone_token': elif conf.key_manager.auth_type == 'keystone_token':
@ -159,8 +159,8 @@ def credential_factory(conf=None, context=None):
domain_name=conf.key_manager.domain_name, domain_name=conf.key_manager.domain_name,
project_id=conf.key_manager.project_id, project_id=conf.key_manager.project_id,
project_name=conf.key_manager.project_name, project_name=conf.key_manager.project_name,
project_domain_id=conf.key_manager.domain_id, project_domain_id=conf.key_manager.project_domain_id,
project_domain_name=conf.key_manager.domain_name, project_domain_name=conf.key_manager.project_domain_name,
reauthenticate=conf.key_manager.reauthenticate) reauthenticate=conf.key_manager.reauthenticate)
else: else: