Browse code

vxlan default ml2 tenant network type

ovs vxlan become supported on most distribution and provides
isolated `multi tenant` networking without special `vlan` aware switch.

In single node deployment you will just see the br-tun ovs bridge
created.

In multi-node setup you might need to adjust the MTU settings.

If your physical switch supports >=1550 MTU size
probably you will not see any issue.

If your guest image honors the MTU size offered via dhcp,
you can adjust your dnsmask settings with the correct (likely 1450 byte)
MTU size.

cirros (udhcp) does not honors these setting, you might need to
set lower MTU size on br-ex and/or adjust network_device_mtu option
in your local.conf.

The default changed, because it will be used with the multi-node neutron
jobs.

If you want the original behavior for whatever reason add these to your
`local.conf`:
ENABLE_TENANT_TUNNELS=False
Q_ML2_TENANT_NETWORK_TYPE=local

Change-Id: Id33ff0eca44905b3996618f1035ad984a6819b5b

Attila Fazekas authored on 2014/07/28 03:47:04
Showing 2 changed files
... ...
@@ -166,10 +166,10 @@ fi
166 166
 # remote connectivity), and no physical resources will be
167 167
 # available for the allocation of provider networks.
168 168
 
169
-# To use GRE tunnels for tenant networks, set to True in
170
-# ``localrc``. GRE tunnels are only supported by the openvswitch
171
-# plugin, and currently only on Ubuntu.
172
-ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-False}
169
+# To disable tunnels (GRE or VXLAN) for tenant networks,
170
+# set to False in ``local.conf``.
171
+# GRE tunnels are only supported by the openvswitch.
172
+ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-True}
173 173
 
174 174
 # If using GRE tunnels for tenant networks, specify the range of
175 175
 # tunnel IDs from which tenant networks are allocated. Can be
... ...
@@ -7,9 +7,9 @@ set +o xtrace
7 7
 
8 8
 # Enable this to simply and quickly enable tunneling with ML2.
9 9
 # Select either 'gre', 'vxlan', or '(gre vxlan)'
10
-Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-}
10
+Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-"vxlan"}
11 11
 # This has to be set here since the agent will set this in the config file
12
-if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
12
+if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; then
13 13
     Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE)
14 14
 elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
15 15
     Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre)
... ...
@@ -57,7 +57,7 @@ function neutron_plugin_configure_common {
57 57
 }
58 58
 
59 59
 function neutron_plugin_configure_service {
60
-    if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
60
+    if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; then
61 61
         Q_SRV_EXTRA_OPTS+=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE)
62 62
     elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
63 63
         # This assumes you want a simple configuration, and will overwrite