From b73ef5c67c1fb56589627f273bfe28a194630c42 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Thu, 11 Jan 2018 03:02:18 +0000 Subject: [PATCH] Fix tempest error on Apex 1. Reconfigure v3_endpoint_type only when it is not None. It is adminURL by default. 2. Ignore the setting of api_v2_admin, as it only applies if api_v2 is set to True. Change-Id: I48b166bdb274467519390af3c1aa5ebf30b38c6d Signed-off-by: Linda Wang --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 8ad005cb5..03e9631a9 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -286,11 +286,12 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None, config.set('object-storage', 'operator_role', CONST.__getattribute__('tempest_object_storage_operator_role')) - if (identity_api_version == '3'): + if CONST.__getattribute__('OS_ENDPOINT_TYPE') is not None: config.set('identity', 'v3_endpoint_type', CONST.__getattribute__('OS_ENDPOINT_TYPE')) + + if (identity_api_version == '3'): config.set('identity-feature-enabled', 'api_v2', False) - config.set('identity-feature-enabled', 'api_v2_admin', False) if CONST.__getattribute__('OS_ENDPOINT_TYPE') is not None: sections = config.sections() -- 2.16.6