summaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/conf_utils.py
diff options
context:
space:
mode:
authorSamuel Bartel <samuel.bartel@orange.com>2018-01-16 10:12:16 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2018-01-16 20:55:26 +0100
commitf93c1aa48e61e1ad23b54feab4fff6b3d9fe9f26 (patch)
tree7fae8790944f76348176c7de9fb6bdae9992dbf8 /functest/opnfv_tests/openstack/tempest/conf_utils.py
parent888bbc6292e7d0a0121f5d72095df24b6f66d3a7 (diff)
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)
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 7f7db35eb..dc60e0a33 100644
--- 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: