diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-06-07 13:21:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-07 13:21:03 +0000 |
| commit | a48bf0c8306e566f15877f3bd72882cf8b7663db (patch) | |
| tree | 20d19ed59ce91a0058af44cc476abaad9cbc5bc3 | |
| parent | dc7f851b0c5412709b52396b0855c0572c904525 (diff) | |
| parent | 28a9d6c6752a5523e18ab91316509c45ceb4e8e1 (diff) | |
Merge "Configure the param auth_version in tempest.conf"
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 15365ccff..4eb5661e9 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -290,6 +290,11 @@ def configure_tempest_update_params(tempest_conf_file, config.set('identity', 'password', CONST.__getattribute__('tempest_identity_user_password')) config.set('identity', 'region', 'RegionOne') + if os_utils.is_keystone_v3(): + auth_version = 'v3' + else: + auth_version = 'v2' + config.set('identity', 'auth_version', auth_version) config.set( 'validation', 'ssh_timeout', CONST.__getattribute__('tempest_validation_ssh_timeout')) |