Merge "Fixed help messages for path_mtu and global_physnet_mtus options"

This commit is contained in:
Jenkins 2016-05-26 16:57:50 +00:00 committed by Gerrit Code Review
commit 4af2fede24

@ -42,23 +42,17 @@ ml2_opts = [
cfg.IntOpt('path_mtu', default=0, cfg.IntOpt('path_mtu', default=0,
help=_('Maximum size of an IP packet (MTU) that can traverse ' help=_('Maximum size of an IP packet (MTU) that can traverse '
'the underlying physical network infrastructure without ' 'the underlying physical network infrastructure without '
'fragmentation. For instances using a ' 'fragmentation when using an overlay/tunnel protocol. '
'self-service/private network, neutron subtracts the ' 'This option allows specifying a physical network MTU '
'overlay protocol overhead from this value and ' 'value that differs from the default global_physnet_mtu '
'provides it to instances via DHCP option 26. For ' 'value.')),
'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.')),
cfg.ListOpt('physical_network_mtus', cfg.ListOpt('physical_network_mtus',
default=[], default=[],
help=_("A list of mappings of physical networks to MTU " help=_("A list of mappings of physical networks to MTU "
"values. The format of the mapping is " "values. The format of the mapping is "
"<physnet>:<mtu val>. This mapping allows " "<physnet>:<mtu val>. This mapping allows "
"specifying a physical network MTU value that " "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', cfg.StrOpt('external_network_type',
help=_("Default network type for external networks when no " help=_("Default network type for external networks when no "
"provider attributes are specified. By default it is " "provider attributes are specified. By default it is "