From 2890306d9b77e7d6a660b04f5ca3cdd82e334b22 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 15 May 2024 00:24:05 +0900 Subject: [PATCH] Follow up "Support ovs/openflow_processed_per_port configuration option" This is follow-up of ebd50d644498f5c436a0b92b5064ce3fbb5100ab and addresses the following points. - Add missing release note - Add unit test assertion of the new resource - replace the hard-coded default by os_service_default fact to avoid additional maintenance effort to sync the default Change-Id: I4de49c4ef317d086cff486e739365384e0d5f3c9 --- manifests/agents/ml2/ovs.pp | 4 ++-- .../notes/openflow_processed_per_port-6587301ed42b53e9.yaml | 5 +++++ spec/classes/neutron_agents_ml2_ovs_spec.rb | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/openflow_processed_per_port-6587301ed42b53e9.yaml diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 3cbaf93af..2fad3975a 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -272,7 +272,7 @@ # [*openflow_processed_per_port*] # (Optional) If enabled, all OVS OpenFlow rules associated to a port will be # processed at once, in one single transaction. -# Defaults to false +# Defaults to $facts['os_service_default']. # class neutron::agents::ml2::ovs ( $package_ensure = 'present', @@ -330,7 +330,7 @@ class neutron::agents::ml2::ovs ( $network_log_rate_limit = $facts['os_service_default'], $network_log_burst_limit = $facts['os_service_default'], $network_log_local_output_log_base = $facts['os_service_default'], - Boolean $openflow_processed_per_port = false, + $openflow_processed_per_port = $facts['os_service_default'], ) { include neutron::deps diff --git a/releasenotes/notes/openflow_processed_per_port-6587301ed42b53e9.yaml b/releasenotes/notes/openflow_processed_per_port-6587301ed42b53e9.yaml new file mode 100644 index 000000000..0460c2ea3 --- /dev/null +++ b/releasenotes/notes/openflow_processed_per_port-6587301ed42b53e9.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``neutron::agents::ml2::ovs::openflow_processed_per_port`` + parameter has been added. diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb index 54f56674f..603b2e898 100644 --- a/spec/classes/neutron_agents_ml2_ovs_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb @@ -91,6 +91,7 @@ describe 'neutron::agents::ml2::ovs' do should contain_neutron_agent_ovs('network_log/rate_limit').with_value('') should contain_neutron_agent_ovs('network_log/burst_limit').with_value('') should contain_neutron_agent_ovs('network_log/local_output_log_base').with_value('') + should contain_neutron_agent_ovs('ovs/openflow_processed_per_port').with_value('') end it 'installs neutron ovs agent package' do