Browse code

Merge "Tempest allow_tenant_isolation in auth section"

Jenkins authored on 2014/12/13 02:14:36
Showing 1 changed files
... ...
@@ -299,8 +299,10 @@ function configure_tempest {
299 299
         iniset $TEMPEST_CONFIG image http_image $TEMPEST_HTTP_IMAGE
300 300
     fi
301 301
 
302
+    # Auth
303
+    iniset $TEMPEST_CONFIG auth allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
304
+
302 305
     # Compute
303
-    iniset $TEMPEST_CONFIG compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
304 306
     iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED
305 307
     iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME
306 308
     iniset $TEMPEST_CONFIG compute ip_version_for_ssh 4