From 403e5a07f51dee1efd335011cdd6b4454d1e7fde Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka <ihrachys@redhat.com> Date: Wed, 6 Apr 2016 10:05:13 +0200 Subject: [PATCH] Fixed help messages for path_mtu and global_physnet_mtus options For path_mtu, make it clear it applies to tunnel typed tenant networks. Removed information about specific mechanisms used to advertise MTU values to instances because a) it duplicates the global_physnet_mtu option description; b) it is not complete now that we also advertise MTU via RAs. Finally, removed description for calculation details because they duplicate global_physnet_mtu description. While at it, fixed help text for global_physnet_mtus option not to refer to segment_mtu which was renamed into global_physnet_mtu lately. Change-Id: Ib0010206f08ec9a76b0e26e84cdb03c80755908d Related-Bug: #1566706 --- neutron/plugins/ml2/config.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/neutron/plugins/ml2/config.py b/neutron/plugins/ml2/config.py index 4e2e43d8b0a..cd4d7ac219e 100644 --- a/neutron/plugins/ml2/config.py +++ b/neutron/plugins/ml2/config.py @@ -42,23 +42,17 @@ ml2_opts = [ cfg.IntOpt('path_mtu', default=0, help=_('Maximum size of an IP packet (MTU) that can traverse ' 'the underlying physical network infrastructure without ' - 'fragmentation. For instances using a ' - 'self-service/private network, neutron subtracts the ' - 'overlay protocol overhead from this value and ' - 'provides it to instances via DHCP option 26. For ' - 'example, using a value of 9000, DHCP provides 8950 ' - 'to instances using a VXLAN network that contains ' - '50 bytes of overhead. Using a value of 0 disables ' - 'this feature and instances typically default to a ' - '1500 MTU. Only impacts instances, not neutron network ' - 'components such as bridges and routers.')), + 'fragmentation when using an overlay/tunnel protocol. ' + 'This option allows specifying a physical network MTU ' + 'value that differs from the default global_physnet_mtu ' + 'value.')), cfg.ListOpt('physical_network_mtus', default=[], help=_("A list of mappings of physical networks to MTU " "values. The format of the mapping is " "<physnet>:<mtu val>. This mapping allows " "specifying a physical network MTU value that " - "differs from the default segment_mtu value.")), + "differs from the default global_physnet_mtu value.")), cfg.StrOpt('external_network_type', help=_("Default network type for external networks when no " "provider attributes are specified. By default it is "