From f6c35a814b50d42c5dc0b878ef742cff8f0d78f8 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Fri, 3 Mar 2017 16:55:50 -0800 Subject: [PATCH] Change auth_version to v3 on Tempest Keystone v3 API is CURRENT and the v2 API is deprecated now. So we need to change the default config of auth_version to fit for current API status. Change-Id: I801e6740258ddea2a1b628a209970e0307d39d12 (cherry picked from commit dc6e55021861afceae2a7778b299df94ceab0a6e) --- lib/tempest | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/tempest b/lib/tempest index fe508af1bf..2786e4cffe 100644 --- a/lib/tempest +++ b/lib/tempest @@ -272,14 +272,14 @@ function configure_tempest { iniset $TEMPEST_CONFIG auth admin_tenant_id $admin_project_id iniset $TEMPEST_CONFIG auth admin_domain_name $admin_domain_name fi - if [ "$ENABLE_IDENTITY_V2" == "False" ]; then - # Only Identity v3 is available; then skip Identity API v2 tests - iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 False - # In addition, use v3 auth tokens for running all Tempest tests - iniset $TEMPEST_CONFIG identity auth_version v3 + if [ "$ENABLE_IDENTITY_V2" == "True" ]; then + # Run Identity API v2 tests ONLY if needed + iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 True else - iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2} + # Skip Identity API v2 tests by default + iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 False 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