openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-04-01 01:23:03 +00:00 committed by Gerrit Code Review
commit 5df5bd602b
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/source/guides/neutron.rst
View File

@ -455,13 +455,18 @@ Miscellaneous Tips
Non-Standard MTU on the Physical Network Non-Standard MTU on the Physical Network
---------------------------------------- ----------------------------------------
DevStack defaults to assume that the MTU on the physical network Neutron by default uses a MTU of 1500 bytes, which is
is 1500. A different MTU can be specified by adding the following to the standard MTU for Ethernet.
the `localrc` part of `local.conf` on each machine.
A different MTU can be specified by adding the following to
the Neutron section of `local.conf`. For example,
if you have network equipment that supports jumbo frames, you could
set the MTU to 9000 bytes by adding the following
:: ::
Q_ML2_PLUGIN_PATH_MTU=1500 [[post-config|/$Q_PLUGIN_CONF_FILE]]
global_physnet_mtu = 9000
Disabling Next Generation Firewall Tools Disabling Next Generation Firewall Tools

12
lib/neutron_plugins/ml2
View File

@ -40,12 +40,6 @@ Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS-port_security}
# L3 Plugin to load for ML2 # L3 Plugin to load for ML2
ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin} ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
# Underlying path MTU for physical network managing br-tun; use '-' instead of
# ':-' to allow people to explicitly override this to blank, to disable
# automatic MTU calculation for tunnelled tenant networks
Q_ML2_PLUGIN_PATH_MTU=${Q_ML2_PLUGIN_PATH_MTU-1500}
function populate_ml2_config { function populate_ml2_config {
CONF=$1 CONF=$1
SECTION=$2 SECTION=$2
@ -83,12 +77,6 @@ function neutron_plugin_configure_service {
echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts." echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts."
fi fi
# Enable ml2 mtu calculation mechanism for networks by providing path mtu
# value for physical devices that are used for br-tun traffic
if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]] && [[ "$Q_ML2_PLUGIN_PATH_MTU" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ml2 path_mtu "$Q_ML2_PLUGIN_PATH_MTU"
fi
# Allow for overrding VLAN configuration (for example, to configure provider # Allow for overrding VLAN configuration (for example, to configure provider
# VLANs) by first checking if Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS is set. # VLANs) by first checking if Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS is set.
if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" == "" ]; then if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" == "" ]; then