openstack/devstack
Code Issues Proposed changes

Merge "Ensure we disable tenant isolation without admin"

Browse Source
This commit is contained in:
Jenkins 2015-10-29 06:18:03 +00:00 committed by Gerrit Code Review
commit fd97214a0e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -559,9 +559,13 @@ function configure_tempest {
fi fi
iniset $TEMPEST_CONFIG auth allow_tenant_isolation False iniset $TEMPEST_CONFIG auth allow_tenant_isolation False
iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml" iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"
elif [[ $TEMPEST_HAS_ADMIN == "False" ]]; then
iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-False}
else else
iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True} iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
fi fi
# Restore IFS # Restore IFS
IFS=$ifs IFS=$ifs
} }