summaryrefslogtreecommitdiffstats
path: root/keystone-moon
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-10-14 21:24:57 +0200
committerasteroide <thomas.duval@orange.com>2015-10-14 21:24:57 +0200
commit6d5c2202c0bc0c4d2e1ab7d5d4bd7bdd631bd465 (patch)
tree773946c4df3d12b80d3f290f20590bf10e0fccfa /keystone-moon
parent004cd2069974e4dfa9ef38c4387529aabcc9dfe3 (diff)
Change the way the tenant dict is updated with Keystone information on the add_tenant_dict.
Change-Id: Ifa164a51b0195f546b97267ffca677bbf3a18eca
Diffstat (limited to 'keystone-moon')
-rw-r--r--keystone-moon/keystone/contrib/moon/core.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py
index f1bba652..bca90adb 100644
--- a/keystone-moon/keystone/contrib/moon/core.py
+++ b/keystone-moon/keystone/contrib/moon/core.py
@@ -411,7 +411,9 @@ class TenantManager(manager.Manager):
if 'id' not in tenant_dict:
tenant_dict['id'] = None
keystone_tenant = self.__get_keystone_tenant_dict(tenant_dict['id'], tenant_dict['name'])
- tenant_dict.update(keystone_tenant)
+ for att in keystone_tenant:
+ if keystone_tenant[att]:
+ tenant_dict[att] = keystone_tenant[att]
# Sync users between intra_authz_extension and intra_admin_extension
self.moonlog_api.debug("add_tenant_dict {}".format(tenant_dict))
if 'intra_admin_extension_id' in tenant_dict and tenant_dict['intra_admin_extension_id']: