openstack/devstack-gate
Code Issues Proposed changes

Merge "Adds DVR related env variable to devstack-vm-gate.sh"

Browse Source
This commit is contained in:
Jenkins
2014-07-31 07:09:30 +00:00
committed by Gerrit Code Review
parent 38d972518a 4b9cedb37e
commit 8d1713f6bd
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devstack-vm-gate-wrap.sh
View File

@@ -167,6 +167,9 @@ 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 distributed virtual routing
export DEVSTACK_GATE_NEUTRON_DVR=${DEVSTACK_GATE_NEUTRON_DVR:-0}
# Set to 1 to run nova in cells mode instead of the default mode
export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}

4
devstack-vm-gate.sh
View File

@@ -48,6 +48,10 @@ function setup_localrc() {
echo "NETWORK_GATEWAY=10.1.0.1" >>localrc
fi
if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then
echo "Q_DVR_MODE=dvr_snat" >>localrc
fi
if [[ "$LOCALRC_BRANCH" == "stable/havana" ]]; then
# we don't want to enable services for grenade that don't have upgrade support
# otherwise they can break grenade, especially when they are projects like