openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Properly direct MTU parameters and allow service defaults 

This patch wires NeutronTenantMtu to path_mtu instead of the deprecated
network_device_mtu. This maintains similar behavior but allows
global_physnet_mtu to be set independently. The default for this
parameter has also been changed to an empty string, allowing proper
service defaults that enable Neutron's MTU logic to be used.

This patch also sets the default for NeutronDnsmasqOptions to an empty
string and introduces handling of empty values when creating the dnsmasq
configuration file.

Note that is a Mitaka only patch. The properties were completely removed
in Newton in change I540ba5dc69d0506f71b59746efcce94c73f9317f.

Closes-Bug: 1590100
Closes-Bug: 1590101

Change-Id: I6d12a2b741b4a81bf60f47fd553b7f71cd25b1c1
This commit is contained in:
Brent Eagles 2016-06-22 14:46:25 -02:30
parent 7fff9c8eaa
commit ecc4e41136
5 changed files with 70 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
overcloud.yaml
View File

@ -189,13 +189,17 @@ parameters:
type: string
hidden: true
NeutronTenantMtu:
default: ''
description: >
The default MTU for tenant networks. For VXLAN/GRE tunneling, this should
be at least 50 bytes smaller than the MTU on the physical network. This
value will be used to set the MTU on the virtual Ethernet device.
This value will be used to construct the NeutronDnsmasqOptions, since that
will determine the MTU that is assigned to the VM host through DHCP.
default: "1400"
This value sets Neutron's path_mtu configuration option. For Mitaka and
later releases, if left empty or set to 0, Neutron will use the value
defined for global_physnet_mtu as the maximum MTU for tenant network
traffic (which currently defaults to 1500). Neutron also automatically
adjusts the MTU used for guests for tenant network types that add
overhead (e.g. GRE and VXLAN). The defaults are recommended unless the
impact of non-default values are well understood. Note also that this may
impact the behavior of NeutronDnsmasqOptions if it is set to a
non-default value.
type: string
NeutronTunnelTypes:
default: 'vxlan'
@ -566,11 +570,19 @@ parameters:
type: number
default: 4096
NeutronDnsmasqOptions:
default: 'dhcp-option-force=26,%MTU%'
description: >
Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU
to be set to the value of NeutronTenantMtu, which should be set to account
for tunnel overhead.
Allows configuration options to be passed to the dnsmasq instances used
by the Neutron DHCP agent. For Mitaka and later releases, providing MTU
overrides through the NeutronDnsmasqOptions is not recommended as Neutron
will provide MTU values to guests based on the tenant network they are
connected to and automatically consider tenant network overhead in this
value (e.g. GRE and VXLAN overhead). However, if required the MTU can be
forced with values like the following,"dhcp-option-force=26,1360" and
"dhcp-option-force=26,%MTU%". The latter requires that NeutronTenantMtu
be configured and will replace the '%MTU%' substring with its value. This
NOT recommended if tenant networks with packet overhead are used as the
guest VM's MTU will be larger than usable MTU on it's tenant netowrk.
default: ''
type: string
NeutronPublicInterfaceDefaultRoute:
default: ''

21
puppet/compute.yaml
View File

@ -120,13 +120,17 @@ parameters:
type: string
NeutronTenantMtu:
description: >
The default MTU for tenant networks. For VXLAN/GRE tunneling, this should
be at least 50 bytes smaller than the MTU on the physical network. This
value will be used to set the MTU on the virtual Ethernet device.
This number is related to the value of NeutronDnsmasqOptions, since that
will determine the MTU that is assigned to the VM host through DHCP.
default: 1400
type: number
This value sets Neutron's path_mtu configuration option. For Mitaka and
later releases, if left empty or set to 0, Neutron will use the value
defined for global_physnet_mtu as the maximum MTU for tenant network
traffic (which currently defaults to 1500). Neutron also automatically
adjusts the MTU used for guests for tenant network types that add
overhead (e.g. GRE and VXLAN). The defaults are recommended unless the
impact of non-default values are well understood. Note also that this may
impact the behavior of NeutronDnsmasqOptions if it is set to a
non-default value.
default: ''
type: string
NeutronTunnelTypes:
type: comma_delimited_list
description: |
@ -514,7 +518,6 @@ resources:
nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
rbd_persistent_storage: {get_input: cinder_enable_rbd_backend}
nova_password: {get_input: nova_password}
nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
nova::vncproxy::common::vncproxy_protocol: {get_input: nova_vncproxy_protocol}
nova::vncproxy::common::vncproxy_host: {get_input: nova_vncproxy_host}
@ -542,7 +545,7 @@ resources:
neutron_host: {get_input: neutron_host}
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
neutron::plugins::ml2::path_mtu: {get_input: neutron_tenant_mtu}
neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}

42
puppet/controller.yaml
View File

@ -425,8 +425,19 @@ parameters:
type: comma_delimited_list
default: "datacentre:br-ex"
NeutronDnsmasqOptions:
default: 'dhcp-option-force=26,1400'
description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead.
description: >
Allows configuration options to be passed to the dnsmasq instances used
by the Neutron DHCP agent. For Mitaka and later releases, providing MTU
overrides through the NeutronDnsmasqOptions is not recommended as Neutron
will provide MTU values to guests based on the tenant network they are
connected to and automatically consider tenant network overhead in this
value (e.g. GRE and VXLAN overhead). However, if required the MTU can be
forced with values like the following,"dhcp-option-force=26,1360" and
"dhcp-option-force=26,%MTU%". The latter requires that NeutronTenantMtu
be configured and will replace the '%MTU%' substring with its value. This
NOT recommended if tenant networks with packet overhead are used as the
guest VM's MTU will be larger than usable MTU on it's tenant netowrk.
default: ''
type: string
NeutronEnableDHCPAgent:
description: Knob to enable/disable DHCP Agent
@ -553,13 +564,17 @@ parameters:
type: string
NeutronTenantMtu:
description: >
The default MTU for tenant networks. For VXLAN/GRE tunneling, this should
be at least 50 bytes smaller than the MTU on the physical network. This
value will be used to set the MTU on the virtual Ethernet device.
This number is related to the value of NeutronDnsmasqOptions, since that
will determine the MTU that is assigned to the VM host through DHCP.
default: 1400
type: number
This value sets Neutron's path_mtu configuration option. For Mitaka and
later releases, if left empty or set to 0, Neutron will use the value
defined for global_physnet_mtu as the maximum MTU for tenant network
traffic (which currently defaults to 1500). Neutron also automatically
adjusts the MTU used for guests for tenant network types that add
overhead (e.g. GRE and VXLAN). The defaults are recommended unless the
impact of non-default values are well understood. Note also that this may
impact the behavior of NeutronDnsmasqOptions if it is set to a
non-default value.
default: ''
type: string
NeutronTunnelTypes:
default: 'vxlan'
description: |
@ -1182,7 +1197,11 @@ resources:
AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
neutron_password: {get_param: NeutronPassword}
neutron_tenant_mtu: {get_param: NeutronTenantMtu}
neutron_dnsmasq_options: {get_param: NeutronDnsmasqOptions}
neutron_dnsmasq_options:
str_replace:
template: {get_param: NeutronDnsmasqOptions}
params:
'%MTU%': {get_param: NeutronTenantMtu}
neutron_dsn:
list_join:
- ''
@ -1544,7 +1563,7 @@ resources:
neutron::server::database_connection: {get_input: neutron_dsn}
neutron::server::api_workers: {get_input: neutron_workers}
neutron::agents::l3::external_network_bridge: {get_input: neutron_external_network_bridge}
neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
neutron::plugins::ml2::path_mtu: {get_input: neutron_tenant_mtu}
neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling}
neutron::agents::ml2::ovs::l2_population: {get_input: neutron_enable_l2pop}
neutron::agents::dhcp::enable_isolated_metadata: {get_input: neutron_enable_isolated_metadata}
@ -1673,7 +1692,6 @@ resources:
nova::api::osapi_compute_workers: {get_input: nova_workers}
nova::api::ec2_workers: {get_input: nova_workers}
nova::api::metadata_workers: {get_input: nova_workers}
nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
nova::database_connection: {get_input: nova_dsn}
nova::api_database_connection: {get_input: nova_api_dsn}
nova::glance_api_servers: {get_input: glance_api_servers}

6
puppet/manifests/overcloud_controller.pp
View File

@ -380,8 +380,12 @@ if hiera('step') >= 3 {
include ::neutron::agents::dhcp
include ::neutron::agents::metadata
$dnsmasq_options = hiera('neutron_dnsmasq_options', '')
# We need to create the dnsmasq-neutron.conf file regardless of
# whether there are configured options or the dhcp agent will fail.
file { '/etc/neutron/dnsmasq-neutron.conf':
content => hiera('neutron_dnsmasq_options'),
content => $dnsmasq_options,
owner => 'neutron',
group => 'neutron',
notify => Service['neutron-dhcp-service'],

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -849,7 +849,7 @@ MYSQL_HOST=localhost\n",
enabled => false,
}
file { '/etc/neutron/dnsmasq-neutron.conf':
content => hiera('neutron_dnsmasq_options'),
content => hiera('neutron_dnsmasq_options', ''),
owner => 'neutron',
group => 'neutron',
notify => Service['neutron-dhcp-service'],