Merge "Fix `def _admin` keystone client factory with trust scope"

This commit is contained in:
Zuul 2018-07-06 10:03:36 +00:00 committed by Gerrit Code Review
commit aa7b5d9fc0
1 changed files with 4 additions and 2 deletions

View File

@ -120,8 +120,10 @@ def _admin_client(trust_id=None):
kwargs = {}
if trust_id:
# Remove project_name and project_id, since we need a trust scoped
# auth object
# Remove domain_id, domain_name, project_name and project_id,
# since we need a trust scoped auth object
kwargs['domain_id'] = None
kwargs['domain_name'] = None
kwargs['project_name'] = None
kwargs['project_domain_name'] = None
kwargs['project_id'] = None