summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-01-11 03:02:18 +0000
committerLinda Wang <wangwulin@huawei.com>2018-01-11 03:08:47 +0000
commitb73ef5c67c1fb56589627f273bfe28a194630c42 (patch)
tree00f96148f56a2971ada23c4cb8001dacdba51aea
parentcc26b57d00b1d5dee299c9b47b25f8f472ac3eb8 (diff)
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 <wangwulin@huawei.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py5
1 files 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()