commit 485b8f13751548b200111cd8a40bc971d27a90af
author Jenkins <jenkins@review.openstack.org> Thu Mar 09 07:43:03 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 09 07:43:03 2017 +0000
tree 39aed6accbba2ac59e42a658368cfad2695f6bbf
parent 6523d6e09789076d0a430bf7b608511fcb1c406a
parent dc6e55021861afceae2a7778b299df94ceab0a6e

Merge "Change auth_version to v3 on Tempest"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index d95a9f5..b48dd07 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -273,13 +273,11 @@
     if [ "$ENABLE_IDENTITY_V2" == "True" ]; then
         # Run Identity API v2 tests ONLY if needed
         iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 True
-        iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
     else
         # Skip Identity API v2 tests by default
         iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 False
-        # Use v3 auth tokens for running all Tempest tests
-        iniset $TEMPEST_CONFIG identity auth_version v3
     fi
+    iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v3}
 
     if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
         iniset $TEMPEST_CONFIG identity ca_certificates_file $SSL_BUNDLE_FILE