From f93c1aa48e61e1ad23b54feab4fff6b3d9fe9f26 Mon Sep 17 00:00:00 2001 From: Samuel Bartel Date: Tue, 16 Jan 2018 10:12:16 +0100 Subject: 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 (cherry picked from commit eb793907cee64bbe2519040559b04d47652cabf0) --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 3 ++- functest/utils/env.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'functest') 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: diff --git a/functest/utils/env.py b/functest/utils/env.py index d7b396eaa..f0952500c 100644 --- 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' } -- cgit 1.2.3-korg