diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-05 21:31:43 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-05 21:46:05 +0200 |
commit | 4f9789cfab845d7209f5a2fc2209cad8941d02d6 (patch) | |
tree | 0ad7d101e4ba3e8e69f2a2dc8b4650e02e857433 /functest/opnfv_tests/openstack/tempest | |
parent | d77a8c4158562dea02500a7b6240b4934ab4fc7c (diff) |
Switch from OS_ENDPOINT_TYPE to OS_INTERFACE
It also set endpoint_type to public in tempest.conf if unset.
JIRA: FUNCTEST-975
Change-Id: I91bd1d7171b4bcf58dbe818696d5b864d5036619
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 36ff77f55..062d75ef1 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -220,20 +220,19 @@ def configure_tempest_update_params( rconfig.set('object-storage', 'operator_role', getattr(config.CONF, 'tempest_object_storage_operator_role')) - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - rconfig.set('identity', 'v3_endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) - - if os.environ.get('OS_ENDPOINT_TYPE') is not None: - sections = rconfig.sections() - services_list = [ - 'compute', 'volume', 'image', 'network', 'data-processing', - 'object-storage', 'orchestration'] - for service in services_list: - if service not in sections: - rconfig.add_section(service) - rconfig.set(service, 'endpoint_type', - os.environ.get('OS_ENDPOINT_TYPE')) + rconfig.set( + 'identity', 'v3_endpoint_type', + os.environ.get('OS_INTERFACE', 'public')) + + sections = rconfig.sections() + services_list = [ + 'compute', 'volume', 'image', 'network', 'data-processing', + 'object-storage', 'orchestration'] + for service in services_list: + if service not in sections: + rconfig.add_section(service) + rconfig.set( + service, 'endpoint_type', os.environ.get('OS_INTERFACE', 'public')) LOGGER.debug('Add/Update required params defined in tempest_conf.yaml ' 'into tempest.conf file') |