Update set of region identity attribut

Use OS_REGION_NAME environment variable if defined

Conflicts:
    functest/opnfv_tests/openstack/tempest/conf_utils.py

Change-Id: Ifcdfc468fa4931ab62ac0f3ead103e15af7c0de6
Signed-off-by: Samuel Bartel <samuel.bartel@orange.com>
(cherry picked from commit eb793907cee64bbe2519040559b04d47652cabf0)

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 7f7db35..dc60e0a 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -218,7 +218,8 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None,
         config.set('compute', 'min_compute_nodes', compute_cnt)
         config.set('compute-feature-enabled', 'live_migration', True)
 
-    config.set('identity', 'region', 'RegionOne')
+    config.set('identity', 'region',
+               CONST.__getattribute__('OS_REGION_NAME'))
     if os_utils.is_keystone_v3():
         auth_version = 'v3'
     else:

diff --git a/functest/utils/env.py b/functest/utils/env.py
index d7b396e..f095250 100644 (file)
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -19,7 +19,8 @@ default_envs = {
     'OS_AUTH_URL': None,
     'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
         'functest', 'ci/config_functest.yaml'),
-    'OS_INSECURE': ''
+    'OS_INSECURE': '',
+    'OS_REGION_NAME': 'RegionOne'
 }