From 9eec46226f2b75374d64993a9bb4531efe7c1d9a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 27 Nov 2023 00:34:18 +0900 Subject: [PATCH] ml2: Remove hard-coded default of path_mtu ... because the hard-coded value and the service default value are same. Change-Id: I5bc162d5c865f23096507c5c13f59de99fd29c06 --- manifests/plugins/ml2.pp | 4 ++-- spec/classes/neutron_plugins_ml2_spec.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index a174b2335..2b25d13bf 100644 --- a/manifests/plugins/ml2.pp +++ b/manifests/plugins/ml2.pp @@ -106,7 +106,7 @@ # (optional) For L3 mechanism drivers, determines the maximum permissible # size of an unfragmented packet travelling from and to addresses where # encapsulated traffic is sent. -# Defaults to 0. +# Defaults to $facts['os_service_default']. # # [*purge_config*] # (optional) Whether to set only the specified config options @@ -136,7 +136,7 @@ class neutron::plugins::ml2 ( $enable_security_group = $facts['os_service_default'], $package_ensure = 'present', $physical_network_mtus = $facts['os_service_default'], - $path_mtu = 0, + $path_mtu = $facts['os_service_default'], Boolean $purge_config = false, $max_header_size = $facts['os_service_default'], $overlay_ip_version = $facts['os_service_default'], diff --git a/spec/classes/neutron_plugins_ml2_spec.rb b/spec/classes/neutron_plugins_ml2_spec.rb index f6d3d4ee7..64d0d9227 100644 --- a/spec/classes/neutron_plugins_ml2_spec.rb +++ b/spec/classes/neutron_plugins_ml2_spec.rb @@ -37,7 +37,6 @@ describe 'neutron::plugins::ml2' do :tunnel_id_ranges => '20:100', :vxlan_group => '224.0.0.1', :vni_ranges => '10:100', - :path_mtu => '0', :package_ensure => 'present', :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/mechanism_drivers').with_value(p[:mechanism_drivers].join(',')) should contain_neutron_plugin_ml2('ml2/extension_drivers').with_value('') - should contain_neutron_plugin_ml2('ml2/path_mtu').with_value(p[:path_mtu]) + should contain_neutron_plugin_ml2('ml2/path_mtu').with_value('') should contain_neutron_plugin_ml2('ml2/physical_network_mtus').with_value('') should contain_neutron_plugin_ml2('ml2/overlay_ip_version').with_value('') should contain_neutron_plugin_ml2('securitygroup/enable_security_group').with_value('')