openstack
/
devstack
Code Issues Proposed changes

Merge "Fix TEMPEST_AUTH_VERSION comparision condition for identity v2" into stable/queens

This commit is contained in:
Zuul 2018-08-14 01:28:16 +00:00 committed by Gerrit Code Review
parent a24e707724 1089e96d04
commit 935ae3f73a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -279,8 +279,8 @@ function configure_tempest {
iniset $TEMPEST_CONFIG identity-feature-enabled api_v2 False
fi
iniset $TEMPEST_CONFIG identity auth_version ${TEMPEST_AUTH_VERSION:-v3}
if [[ "$TEMPEST_AUTH_VERSION" != "v2.0" ]]; then
# we're going to disable v2 admin unless we're using v2.0 by default.
if [[ "$TEMPEST_AUTH_VERSION" != "v2" ]]; then
# we're going to disable v2 admin unless we're using v2 by default.
iniset $TEMPEST_CONFIG identity-feature-enabled api_v2_admin False
fi