Merge "Remove unused env variable option for tenant isolation"

This commit is contained in:
Jenkins 2015-02-06 15:26:29 +00:00 committed by Gerrit Code Review
commit 32a1cbba3c

View File

@ -471,7 +471,6 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON_DVR=1
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -503,7 +502,6 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -538,7 +536,6 @@
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_POSTGRES=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
export DEVSTACK_GATE_CONFIGDRIVE=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1204,7 +1201,6 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST_ALLOW_TENANT_ISOLATION=1
export DEVSTACK_GATE_KEYSTONE_V3=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then