diff options
author | Georg Kunz <georg.kunz@ericsson.com> | 2018-01-29 16:24:48 +0100 |
---|---|---|
committer | Georg Kunz <georg.kunz@ericsson.com> | 2018-01-30 07:54:29 +0000 |
commit | fd18b6790cd9b59851bce6746cc83f27d3e18e4f (patch) | |
tree | d60e180db20a12797bae4dbccaa480f11814bcfa /snaps/openstack/utils/keystone_utils.py | |
parent | 2a09f4166562c1a91410a246d4ab08f0d5d71039 (diff) |
Avoid checking Keystone v3 domains when using API v2.0stable/euphrates
Introducing a version check to avoid checking keystone domains,
which are an auth API v3 feature, when only auth API v2.0 is
being used.
Change-Id: I220c6637e5f65124e5dbe7d5246490c3986b7a66
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
Diffstat (limited to 'snaps/openstack/utils/keystone_utils.py')
-rw-r--r-- | snaps/openstack/utils/keystone_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/snaps/openstack/utils/keystone_utils.py b/snaps/openstack/utils/keystone_utils.py index b36c19f..1769e77 100644 --- a/snaps/openstack/utils/keystone_utils.py +++ b/snaps/openstack/utils/keystone_utils.py @@ -374,9 +374,10 @@ def get_domain_by_id(keystone, domain_id): :param domain_id: the domain ID to retrieve :return: the SNAPS-OO Domain domain object """ - domain = keystone.domains.get(domain_id) - if domain: - return Domain(name=domain.name, domain_id=domain.id) + if keystone.version != V2_VERSION_STR: + domain = keystone.domains.get(domain_id) + if domain: + return Domain(name=domain.name, domain_id=domain.id) def __get_os_domain_by_name(keystone, domain_name): |