diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-01-09 15:51:39 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-01-09 15:58:43 +0000 |
| commit | c0e6d306e0bbc72463c1c0ce46e283425444de53 (patch) | |
| tree | baf68832b44dd6b81974627aeb4a0d51d75ab470 /functest/opnfv_tests | |
| parent | 171a354252112e6b1590358120c818cc7ce20c3b (diff) | |
Remove the judgement of OS_ENDPOINT_TYPE
Remove the judgement of OS_ENDPOINT_TYPE when configuring
[identity-feature-enabled] section in tempest.conf
Change-Id: Ia0f6926cdd6e063c953358df5108b537917418bc
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 116b1bf0..8ad005cb 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -286,13 +286,14 @@ 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'): + config.set('identity', 'v3_endpoint_type', + CONST.__getattribute__('OS_ENDPOINT_TYPE')) + 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() - if (identity_api_version == '3'): - config.set('identity', 'v3_endpoint_type', - CONST.__getattribute__('OS_ENDPOINT_TYPE')) - config.set('identity-feature-enabled', 'api_v2', False) - config.set('identity-feature-enabled', 'api_v2_admin', False) services_list = ['compute', 'volume', 'image', |