1. devstack
  2. Commit c148b13c60525be637d23a1330cf56376f11432f
Browse code

Ensure we disable tenant isolation without admin

This commit fixes an issue with the tempest configuration when
TEMPEST_HAS_ADMIN is disabled. Without admin credentials tempest
is unable to create credentials at all so enabling tenant isolation
is not going to work. Previously devstack wasn't setting it one way
or the other when TEMPEST_HAS_ADMIN was set, which results in the
default of being enabled. So jobs that try to run tempest without
admin were failing.

Change-Id: Iff496cb5cbf29f17c130cfad746b48d8547ca965

Matthew Treinish authored on 2015/10/22 23:05:00
Showing 1 changed files
lib/tempest
History View file @ c148b13
... ... 
@@ -564,9 +564,13 @@ function configure_tempest {
564 564 
         fi
565 565 
         iniset $TEMPEST_CONFIG auth allow_tenant_isolation False
566 566 
         iniset $TEMPEST_CONFIG auth test_accounts_file "etc/accounts.yaml"
567 
+    elif [[ $TEMPEST_HAS_ADMIN == "False" ]]; then
568 
+        iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-False}
569 
+
567 570 
     else
568 571 
         iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
569 572 
     fi
573 
+
570 574 
     # Restore IFS
571 575 
     IFS=$ifs
572 576 
 }