Skip to content

Commit 117a8b9

Browse files
cboylancboylan
committed
Try vxlan instead of gre for overlays
It looks like some providers may not allow IP type 47 (GRE) traffic to pass their networks. See if using vxlan is a useable workaround. Change-Id: I951e7e1bd98eeaf347e85296c12e027e225c2c97
1 parent 239af44 commit 117a8b9

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎devstack-vm-gate.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ function setup_nova_net_networking {
7171
# issue with nova net configuring br100 to take over eth0
7272
# by default.
7373
# TODO (clarkb): figure out how to make bridge setup sane with ansible.
74-
ovs_gre_bridge "br_pub" $primary_node "True" 1 \
74+
ovs_vxlan_bridge "br_pub" $primary_node "True" 1 \
7575
$FLOATING_HOST_PREFIX $FLOATING_HOST_MASK \
7676
$sub_nodes
77-
ovs_gre_bridge "br_flat" $primary_node "False" 128 \
77+
ovs_vxlan_bridge "br_flat" $primary_node "False" 128 \
7878
$sub_nodes
7979
cat <<EOF >>"$localrc"
8080
FLAT_INTERFACE=br_flat
@@ -123,7 +123,7 @@ EOF
123123
MULTI_HOST=True
124124
EOF
125125
elif [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq '1' ]]; then
126-
ovs_gre_bridge "br-ex" $primary_node "True" 1 \
126+
ovs_vxlan_bridge "br-ex" $primary_node "True" 1 \
127127
$FLOATING_HOST_PREFIX $FLOATING_HOST_MASK \
128128
$sub_nodes
129129
fi

‎functions.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ function enable_netconsole {
10021002
# For OVS troubleshooting needs:
10031003
# http://www.yet.org/2014/09/openvswitch-troubleshooting/
10041004
#
1005-
function ovs_gre_bridge {
1005+
function ovs_vxlan_bridge {
10061006
if is_fedora; then
10071007
local ovs_package='openvswitch'
10081008
local ovs_service='openvswitch'
@@ -1048,26 +1048,26 @@ function ovs_gre_bridge {
10481048
# For reference on how to setup a tunnel using OVS see:
10491049
# http://openvswitch.org/support/config-cookbooks/port-tunneling/
10501050
# The command below is equivalent to the sequence of ip/brctl commands
1051-
# where an interface of gre type is created first, and then plugged into
1051+
# where an interface of vxlan type is created first, and then plugged into
10521052
# the bridge; options are command specific configuration key-value pairs.
10531053
#
1054-
# Create the gre tunnel for the Controller/Network Node:
1054+
# Create the vxlan tunnel for the Controller/Network Node:
10551055
# This establishes a tunnel between remote $node_ip to local $host_ip
10561056
# uniquely identified by a key $offset
10571057
sudo ovs-vsctl --may-exist add-port $bridge_name \
10581058
${bridge_name}_${node_ip} \
1059-
-- set interface ${bridge_name}_${node_ip} type=gre \
1059+
-- set interface ${bridge_name}_${node_ip} type=vxlan \
10601060
options:remote_ip=${node_ip} \
10611061
options:key=${offset} \
10621062
options:local_ip=${host_ip}
1063-
# Now complete the gre tunnel setup for the Compute Node:
1063+
# Now complete the vxlan tunnel setup for the Compute Node:
10641064
# Similarly this establishes the tunnel in the reverse direction
10651065
remote_command $node_ip "$install_ovs_deps"
10661066
remote_command $node_ip sudo ovs-vsctl --may-exist add-br $bridge_name
10671067
remote_command $node_ip sudo ip link set mtu $mtu dev $bridge_name
10681068
remote_command $node_ip sudo ovs-vsctl --may-exist add-port $bridge_name \
10691069
${bridge_name}_${host_ip} \
1070-
-- set interface ${bridge_name}_${host_ip} type=gre \
1070+
-- set interface ${bridge_name}_${host_ip} type=vxlan \
10711071
options:remote_ip=${host_ip} \
10721072
options:key=${offset} \
10731073
options:local_ip=${node_ip}

0 commit comments

Comments
 (0)