openstack/devstack
Code Issues Proposed changes

Merge "Change auth_version to v3 on Tempest"

Browse Source
This commit is contained in:
Jenkins 2017-03-09 07:43:03 +00:00 committed by Gerrit Code Review
commit 485b8f1375
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -273,13 +273,11 @@ function configure_tempest {
if [ "$ENABLE_IDENTITY_V2" == "True" ]; then if [ "$ENABLE_IDENTITY_V2" == "True" ]; then
# Run Identity API v2 tests ONLY if needed # Run Identity API v2 tests ONLY if needed
iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 True iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 True
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v2}
else else
# Skip Identity API v2 tests by default # Skip Identity API v2 tests by default
iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 False 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 fi
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v3}
if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then if is_ssl_enabled_service "key" || is_service_enabled tls-proxy; then
iniset $TEMPEST_CONFIG identity ca_certificates_file $SSL_BUNDLE_FILE iniset $TEMPEST_CONFIG identity ca_certificates_file $SSL_BUNDLE_FILE