Browse code

Merge "Neutron: MTU settings are now sane, so remove from DevStack"

Jenkins authored on 2016/04/01 10:23:03
Showing 2 changed files
... ...
@@ -455,13 +455,18 @@ Miscellaneous Tips
455 455
 Non-Standard MTU on the Physical Network
456 456
 ----------------------------------------
457 457
 
458
-DevStack defaults to assume that the MTU on the physical network
459
-is 1500.  A different MTU can be specified by adding the following to
460
-the `localrc` part of `local.conf` on each machine.
458
+Neutron by default uses a MTU of 1500 bytes, which is
459
+the standard MTU for Ethernet.
460
+
461
+A different MTU can be specified by adding the following to
462
+the Neutron section of `local.conf`. For example,
463
+if you have network equipment that supports jumbo frames, you could
464
+set the MTU to 9000 bytes by adding the following
461 465
 
462 466
 ::
463 467
 
464
-    Q_ML2_PLUGIN_PATH_MTU=1500
468
+    [[post-config|/$Q_PLUGIN_CONF_FILE]]
469
+    global_physnet_mtu = 9000
465 470
 
466 471
 
467 472
 Disabling Next Generation Firewall Tools
... ...
@@ -40,12 +40,6 @@ Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS-port_security}
40 40
 # L3 Plugin to load for ML2
41 41
 ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
42 42
 
43
-# Underlying path MTU for physical network managing br-tun; use '-' instead of
44
-# ':-' to allow people to explicitly override this to blank, to disable
45
-# automatic MTU calculation for tunnelled tenant networks
46
-Q_ML2_PLUGIN_PATH_MTU=${Q_ML2_PLUGIN_PATH_MTU-1500}
47
-
48
-
49 43
 function populate_ml2_config {
50 44
     CONF=$1
51 45
     SECTION=$2
... ...
@@ -83,12 +77,6 @@ function neutron_plugin_configure_service {
83 83
         echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts."
84 84
     fi
85 85
 
86
-    # Enable ml2 mtu calculation mechanism for networks by providing path mtu
87
-    # value for physical devices that are used for br-tun traffic
88
-    if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]] && [[ "$Q_ML2_PLUGIN_PATH_MTU" != "" ]]; then
89
-        iniset /$Q_PLUGIN_CONF_FILE ml2 path_mtu "$Q_ML2_PLUGIN_PATH_MTU"
90
-    fi
91
-
92 86
     # Allow for overrding VLAN configuration (for example, to configure provider
93 87
     # VLANs) by first checking if Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS is set.
94 88
     if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" == "" ]; then