diff options
| author |   asteroide <thomas.duval@orange.com> | 2015-10-12 14:46:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-12 14:46:08 +0000 |
| commit | 6273077bc9ea98c5e54d4f89a364dc403c13af1b (patch) | |
| tree | 238e1f3faeec556edb81681e1c445849d0da4b11 | |
| parent | 36c213c1e23f0bf619fae3d2db607fdd4c1159d8 (diff) | |
| parent | 92579d80451f329a807a20acfb1686599f85cec4 (diff) | |
Merge "Check the content of tenant_dict['intra_admin_extension_id'] to allow or not the synchronisation process."
| -rw-r--r-- | keystone-moon/keystone/contrib/moon/core.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/keystone-moon/keystone/contrib/moon/core.py b/keystone-moon/keystone/contrib/moon/core.py index 4f8074f7..f1bba652 100644 --- a/keystone-moon/keystone/contrib/moon/core.py +++ b/keystone-moon/keystone/contrib/moon/core.py @@ -413,8 +413,9 @@ class TenantManager(manager.Manager): keystone_tenant = self.__get_keystone_tenant_dict(tenant_dict['id'], tenant_dict['name']) tenant_dict.update(keystone_tenant) # Sync users between intra_authz_extension and intra_admin_extension - if 'intra_admin_extension_id' in tenant_dict: - if 'intra_authz_extension_id' in tenant_dict: + 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']: + if 'intra_authz_extension_id' in tenant_dict and tenant_dict['intra_authz_extension_id']: # authz_subjects_dict = self.admin_api.get_subjects_dict(self.root_api.get_root_admin_id(), tenant_dict['intra_authz_extension_id']) # admin_subjects_dict = self.admin_api.get_subjects_dict(self.root_api.get_root_admin_id(), tenant_dict['intra_admin_extension_id']) # for _subject_id in authz_subjects_dict: |