From f1a24a75a90db58973894c4262ada935c34752b8 Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Wed, 8 Jul 2015 11:02:28 -0700 Subject: [PATCH] Drop these config switches as they are no longer being used The project-config job using these switches is being dropped, and since the referenced bugs look to be addressed, we can clean up these as well. Change-Id: I00d99c05328268b33c6f20b1d24e7507afccb92c Depends-on: I886f64a2379a8e16957e6ca4bcf784cb22ad2c28 --- devstack-vm-gate-wrap.sh | 4 ---- devstack-vm-gate.sh | 5 ----- 2 files changed, 9 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index c7a82daa..e7900825 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -201,10 +201,6 @@ export DEVSTACK_CINDER_SECURE_DELETE=${DEVSTACK_CINDER_SECURE_DELETE:-0} # Only applicable to master branch export DEVSTACK_GATE_NEUTRON=${DEVSTACK_GATE_NEUTRON:-0} -# Set to 1 to run neutron with features that make it unstable -# TODO(armax): get rid of this if as soon as bugs #1464612 and #1432189 get resolved -export DEVSTACK_GATE_NEUTRON_UNSTABLE=${DEVSTACK_GATE_NEUTRON_UNSTABLE:-0} - # Set to 1 to run neutron distributed virtual routing export DEVSTACK_GATE_NEUTRON_DVR=${DEVSTACK_GATE_NEUTRON_DVR:-0} diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index a071601b..8515c426 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -212,11 +212,6 @@ function setup_localrc { if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then echo "Q_USE_DEBUG_COMMAND=True" >>"$localrc_file" echo "NETWORK_GATEWAY=10.1.0.1" >>"$localrc_file" - # TODO(armax): get rid of this if as soon as bugs #1464612 and #1432189 get resolved - if [[ "$DEVSTACK_GATE_NEUTRON_UNSTABLE" -eq "0" ]]; then - echo "MYSQL_DRIVER=MySQL-python" >>"$localrc_file" - echo "API_WORKERS=0" >>"$localrc_file" - fi fi if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then