aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-06-07 02:19:32 +0000
committerLinda Wang <wangwulin@huawei.com>2017-06-07 02:19:32 +0000
commit28a9d6c6752a5523e18ab91316509c45ceb4e8e1 (patch)
tree5667ce5bb24293b2f22a29c305a6d735bacb8932
parent6c6b03b310cf60b251a52127901431f7d059e45f (diff)
Configure the param auth_version in tempest.conf
1. If the auth_url is "https://192.168.31.222:443/identity-admin/v3", the auth_version in tempest.conf is supposed to be "v3", not "id". 2. For rally 0.8.1. it is a bug when obtaining the auth_version, please see [1], which has been fixed in rally master. [1]: https://review.openstack.org/#/c/468599/ Change-Id: Ia7474938a741a0954f17f7c7650544dbc0a28853 Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py5
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 15365ccf..4eb5661e 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'))