openstack/puppet-neutron
Code Issues Proposed changes

Merge "ml2: Remove hard-coded default of path_mtu"

Browse Source
This commit is contained in:
Zuul 2023-11-27 16:48:35 +00:00 committed by Gerrit Code Review
commit f3d1c575ca
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/plugins/ml2.pp
View File

@ -106,7 +106,7 @@
# (optional) For L3 mechanism drivers, determines the maximum permissible # (optional) For L3 mechanism drivers, determines the maximum permissible
# size of an unfragmented packet travelling from and to addresses where # size of an unfragmented packet travelling from and to addresses where
# encapsulated traffic is sent. # encapsulated traffic is sent.
# Defaults to 0. # Defaults to $facts['os_service_default'].
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@ -136,7 +136,7 @@ class neutron::plugins::ml2 (
$enable_security_group = $facts['os_service_default'], $enable_security_group = $facts['os_service_default'],
$package_ensure = 'present', $package_ensure = 'present',
$physical_network_mtus = $facts['os_service_default'], $physical_network_mtus = $facts['os_service_default'],
$path_mtu = 0, $path_mtu = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
$max_header_size = $facts['os_service_default'], $max_header_size = $facts['os_service_default'],
$overlay_ip_version = $facts['os_service_default'], $overlay_ip_version = $facts['os_service_default'],

3
spec/classes/neutron_plugins_ml2_spec.rb
View File

@ -37,7 +37,6 @@ describe 'neutron::plugins::ml2' do
:tunnel_id_ranges => '20:100', :tunnel_id_ranges => '20:100',
:vxlan_group => '224.0.0.1', :vxlan_group => '224.0.0.1',
:vni_ranges => '10:100', :vni_ranges => '10:100',
:path_mtu => '0',
:package_ensure => 'present', :package_ensure => 'present',
:purge_config => false, :purge_config => false,
} }
@ -69,7 +68,7 @@ describe 'neutron::plugins::ml2' do
should contain_neutron_plugin_ml2('ml2/tenant_network_types').with_value(p[:tenant_network_types].join(',')) should contain_neutron_plugin_ml2('ml2/tenant_network_types').with_value(p[:tenant_network_types].join(','))
should contain_neutron_plugin_ml2('ml2/mechanism_drivers').with_value(p[:mechanism_drivers].join(',')) should contain_neutron_plugin_ml2('ml2/mechanism_drivers').with_value(p[:mechanism_drivers].join(','))
should contain_neutron_plugin_ml2('ml2/extension_drivers').with_value('<SERVICE DEFAULT>') should contain_neutron_plugin_ml2('ml2/extension_drivers').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('ml2/path_mtu').with_value(p[:path_mtu]) should contain_neutron_plugin_ml2('ml2/path_mtu').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('ml2/physical_network_mtus').with_value('<SERVICE DEFAULT>') should contain_neutron_plugin_ml2('ml2/physical_network_mtus').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('ml2/overlay_ip_version').with_value('<SERVICE DEFAULT>') should contain_neutron_plugin_ml2('ml2/overlay_ip_version').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('<SERVICE DEFAULT>') should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('<SERVICE DEFAULT>')