From da6845fa3817bbdb25506e3185b4e8b81917bc99 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Fri, 29 Dec 2017 06:24:37 +0000 Subject: Disable keystone v2 if keystone v3 is available Change-Id: I9ae18ac6702b6bc1df80e5ff794307929e4aefb9 Signed-off-by: Linda Wang --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index fff99a320..116b1bf0c 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -291,10 +291,8 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None, if (identity_api_version == '3'): config.set('identity', 'v3_endpoint_type', CONST.__getattribute__('OS_ENDPOINT_TYPE')) - if 'identity-feature-enabled' not in sections: - config.add_section('identity-feature-enabled') - config.set('identity-feature-enabled', 'api_v2', False) - config.set('identity-feature-enabled', 'api_v2_admin', False) + config.set('identity-feature-enabled', 'api_v2', False) + config.set('identity-feature-enabled', 'api_v2_admin', False) services_list = ['compute', 'volume', 'image', -- cgit 1.2.3-korg