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>

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')