diff options
| author |   Cédric Ollivier <ollivier.cedric@gmail.com> | 2018-07-09 22:39:42 +0200 |
|---|---|---|
| committer |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-07-27 11:33:09 +0200 |
| commit | 660bfbdb2f5cb050876fed4c328c005f701a5f60 (patch) | |
| tree | 391973f92420b9336417558a639979cf504b2e56 /functest/opnfv_tests/openstack | |
| parent | 0c1b1131fe8fdb1cf3863e3cb9cd1e65f5d7b4c3 (diff) | |
Force region to RegionOne if OS_REGION_NAME is unset
tempest still selects the first one if unset [1].
JIRA: FUNCTEST-990
[1] https://docs.openstack.org/tempest/latest/sampleconf.html
Change-Id: I238d47173c2c4aa1db694028e4d44b80b0e280f1
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>
(cherry picked from commit 8b2f524f0f17f06bf1de02e0165230bad218132b)
Diffstat (limited to 'functest/opnfv_tests/openstack')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 062d75ef1..327333e0d 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -205,8 +205,8 @@ def configure_tempest_update_params( # enable multinode tests rconfig.set('compute', 'min_compute_nodes', compute_cnt) rconfig.set('compute-feature-enabled', 'live_migration', True) - - rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME')) + if os.environ.get('OS_REGION_NAME'): + rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME')) identity_api_version = os.environ.get("OS_IDENTITY_API_VERSION", '3') if identity_api_version == '3': auth_version = 'v3' |