@@ -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

 }