Merge "Ensure we disable tenant isolation without admin"

2015-10-29 06:18:03 +00:00
parent ff113c01dd c148b13c60
commit fd97214a0e
1 changed files with 4 additions and 0 deletions
--- a/lib/tempest
+++ b/lib/tempest
@@ -559,9 +559,13 @@ function configure_tempest {
        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
 }