Browse code

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

Neutron had a lot of work done during the Mitaka cycle to fix MTU
issues, so let's see if Neutron can stand on its own.

This commit reverts 06cfce37560243d22cd05b2c620be6702528a0b1

Neutron patches:
I6ffc8973c9b8f46cc19922ff04fdd2d23646b878
I4096a3e7704032fa4aa5c3aa8bcaec4e38d0d06d
I6a10c4dfc1f2198667f3d02528e2ca8020cb5bb8
Ic091fa78dfd133179c71cbc847bf955a06cb248a
Idf6221fee2c7da86123b330ad3c235ecc6868242
I6859ebdde1f7e3a8163b49d705620e522ada606a

Change-Id: Ie88c7ebb29adadde530217c95e2f38aacb119dc8

Sean M. Collins authored on 2016/03/17 00:53:09
Showing 2 changed files
... ...
@@ -443,13 +443,18 @@ Miscellaneous Tips
443 443
 Non-Standard MTU on the Physical Network
444 444
 ----------------------------------------
445 445
 
446
-DevStack defaults to assume that the MTU on the physical network
447
-is 1500.  A different MTU can be specified by adding the following to
448
-the `localrc` part of `local.conf` on each machine.
446
+Neutron by default uses a MTU of 1500 bytes, which is
447
+the standard MTU for Ethernet.
448
+
449
+A different MTU can be specified by adding the following to
450
+the Neutron section of `local.conf`. For example,
451
+if you have network equipment that supports jumbo frames, you could
452
+set the MTU to 9000 bytes by adding the following
449 453
 
450 454
 ::
451 455
 
452
-    Q_ML2_PLUGIN_PATH_MTU=1500
456
+    [[post-config|/$Q_PLUGIN_CONF_FILE]]
457
+    global_physnet_mtu = 9000
453 458
 
454 459
 
455 460
 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