diff options
| author |   Samuel Bartel <samuel.bartel@orange.com> | 2018-01-16 10:12:16 +0100 |
|---|---|---|
| committer | Samuel Bartel <samuel.bartel@orange.com> | 2018-01-16 10:27:25 +0100 |
| commit | eb793907cee64bbe2519040559b04d47652cabf0 (patch) | |
| tree | cd56c90802f873efd59841dc01ac9b0b1e9e6526 | |
| parent | 12c99c5f3fef126283e3a9795c4c1d436cc7846f (diff) | |
Update set of region identity attribut
Use OS_REGION_NAME environment variable if defined
Change-Id: Ifcdfc468fa4931ab62ac0f3ead103e15af7c0de6
Signed-off-by: Samuel Bartel <samuel.bartel@orange.com>
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 3 | ||||
| -rw-r--r-- | functest/utils/env.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 03e9631a..e61ab813 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -272,7 +272,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')) identity_api_version = os.getenv( "OS_IDENTITY_API_VERSION", os.getenv("IDENTITY_API_VERSION")) if (identity_api_version == '3'): diff --git a/functest/utils/env.py b/functest/utils/env.py index d7b396ea..f0952500 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' } |