commit fd97214a0ecf5069dcee90a7f7d3358a4790e923
author Jenkins <jenkins@review.openstack.org> Thu Oct 29 06:18:03 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Oct 29 06:18:03 2015 +0000
tree aa42ec43e18538581bd3b32d7d6e769ea45e716b
parent ff113c01ddda4cc204ef1c88c89dcaa45519d503
parent c148b13c60525be637d23a1330cf56376f11432f

Merge "Ensure we disable tenant isolation without admin"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 6b6a5d1..32630db 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -559,9 +559,13 @@
         fi
         iniset $TEMPEST_CONFIG auth allow_tenant_isolation False
         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
         iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
     fi
+
     # Restore IFS
     IFS=$ifs
 }