Browse code

Merge "Turn off tenant_isolation in tempest for quantum"

Jenkins authored on 2013/01/08 11:05:04
Showing 1 changed files
... ...
@@ -188,6 +188,12 @@ function configure_tempest() {
188 188
     iniset $TEMPEST_CONF compute resize_available False
189 189
     iniset $TEMPEST_CONF compute change_password_available False
190 190
     iniset $TEMPEST_CONF compute compute_log_level ERROR
191
+    # Note(nati) current tempest don't create network for each tenant
192
+    # so reuse same tenant for now
193
+    if is_service_enabled quantum; then
194
+        TEMPEST_ALLOW_TENANT_ISOLATION=${TEMPEST_ALLOW_TENANT_ISOLATION:-False}
195
+    fi
196
+    iniset $TEMPEST_CONF compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
191 197
     #Skip until #1074039 is fixed
192 198
     iniset $TEMPEST_CONF compute run_ssh False
193 199
     iniset $TEMPEST_CONF compute ssh_user ${DEFAULT_INSTANCE_USER:-$OS_USERNAME}