Fix def _admin keystone client factory with trust scope

When trust_id is defined, the factory is adding None
value for all project scope keys in kwargs to avoid
this auth parameters will be loaded from auth conf.
This patch add None value for missing domain scope
keys domain_id and domain_name too.

Change-Id: If7dd2e171178d8408ec9802671198c9cf74707e1
Closes-Bug: #1763327
This commit is contained in:
Kevin Pouget
2018-04-12 09:52:14 +02:00
parent 573d2d0682
commit 0f65f608f6

View File

@@ -118,8 +118,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