openstack
/
devstack-gate
Code Issues Proposed changes

Allow manual request for overlay network in multinode 

Change-Id: I17218d9c71ab91a13f404f16c7e4b0f03abe533a
This commit is contained in:
Omer Anson 2017-02-22 20:21:33 +02:00
parent 0ef46186dd
commit 125d051bbf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,6 +222,9 @@ fi
# Set to 1 to run neutron distributed virtual routing
export DEVSTACK_GATE_NEUTRON_DVR=${DEVSTACK_GATE_NEUTRON_DVR:-0}
# This variable tells devstack-gate to set up an overlay network between the nodes.
export DEVSTACK_GATE_NET_OVERLAY=${DEVSTACK_GATE_NET_OVERLAY:-$DEVSTACK_GATE_NEUTRON_DVR}
# Set to 1 to run nova in cells mode instead of the default mode
export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}

2
devstack-vm-gate.sh
View File

@ -143,7 +143,7 @@ function setup_multinode_connectivity {
localrc_set $sub_localconf "MULTI_HOST" "True"
# and on the master
localrc_set $localconf "MULTI_HOST" "True"
elif [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq '1' ]]; then
elif [[ "$DEVSTACK_GATE_NET_OVERLAY" -eq '1' ]]; then
ovs_vxlan_bridge "br-ex" $primary_node "True" 1 \
$FLOATING_HOST_PREFIX $FLOATING_HOST_MASK \
$sub_nodes