Merge "Drop these config switches as they are no longer being used"

This commit is contained in:
Jenkins
2015-08-18 00:12:36 +00:00
committed by Gerrit Code Review
2 changed files with 0 additions and 9 deletions

View File

@@ -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}

View File

@@ -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