From 00b1a51bd630cce37fa5026963979767df7a807d Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 24 Jan 2017 14:52:38 +0000 Subject: [PATCH] Fix config_tempest failing due to v3 on ocata The patch fixes config_tempest which was failing on RDO ocata installed by packstack because of keystone v3 conflicts. Change-Id: I4ff7cbc1cc11a892d870b146a280e6bdfbeeaba9 --- config_tempest/api_discovery.py | 2 +- config_tempest/config_tempest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config_tempest/api_discovery.py b/config_tempest/api_discovery.py index 3edb0e24..3e90f7b8 100644 --- a/config_tempest/api_discovery.py +++ b/config_tempest/api_discovery.py @@ -202,7 +202,7 @@ def discover(auth_provider, region, object_store_discovery=True, disable_ssl_certificate_validation) if name == 'object-store' and not object_store_discovery: services[name]['extensions'] = [] - else: + elif 'v3' not in ep['publicURL']: # is not v3 url services[name]['extensions'] = service.get_extensions() services[name]['versions'] = service.get_versions() return services diff --git a/config_tempest/config_tempest.py b/config_tempest/config_tempest.py index 853c065c..9b6a776c 100755 --- a/config_tempest/config_tempest.py +++ b/config_tempest/config_tempest.py @@ -786,12 +786,12 @@ def configure_discovered_services(conf, services): keystone_v3_support = conf.get('identity-feature-enabled', 'api_v3') for service, ext_key in SERVICE_EXTENSION_KEY.iteritems(): if service in services: - extensions = ','.join(services[service]['extensions']) + extensions = ','.join(services[service].get('extensions', "")) if service == 'object-store': # tempest.conf is inconsistent and uses 'object-store' for the # catalog name but 'object-storage-feature-enabled' service = 'object-storage' - if service == 'identity' and keystone_v3_support: + elif service == 'identity' and keystone_v3_support: identity_v3_ext = api_discovery.get_identity_v3_extensions( conf.get("identity", "uri_v3")) extensions = list(set(extensions.split(',') + identity_v3_ext))