From e4a39a7a2ff0f0d8e569cf89a694429055628734 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 16 Jan 2024 11:31:39 +0900 Subject: [PATCH] Support [ovn_nb_global] ignore_lsp_down This option was added during this cycle to retain the previous behavior with recent OVN versions. Depends-on: https://review.opendev.org/896545 Change-Id: I91d26018bb401e6f7f7a766e7aafa21bec574828 --- manifests/plugins/ml2/ovn.pp | 7 +++++++ .../notes/ovn-ignore_lsp_down-c513199c93f80371.yaml | 5 +++++ spec/classes/neutron_plugins_ml2_ovn_spec.rb | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/ovn-ignore_lsp_down-c513199c93f80371.yaml diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index bc44228cb..68466ecfc 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/manifests/plugins/ml2/ovn.pp @@ -113,6 +113,11 @@ # Type: boolean # Defaults to $facts['os_service_default'] # +# [*ignore_lsp_down*] +# (optional) Do not install ARP/ND reply flows for logical switch ports +# if the port is DOWN. +# Defaults to $facts['os_service_default'] +# # [*network_log_rate_limit*] # (Optional) Maximum packets logging per second. # Used by logging service plugin. @@ -151,6 +156,7 @@ class neutron::plugins::ml2::ovn( $vhostuser_socket_dir = $facts['os_service_default'], $ovn_emit_need_to_frag = $facts['os_service_default'], $localnet_learn_fdb = $facts['os_service_default'], + $ignore_lsp_down = $facts['os_service_default'], $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'], @@ -183,6 +189,7 @@ class neutron::plugins::ml2::ovn( 'ovn/vhost_sock_dir' : value => $vhostuser_socket_dir; 'ovn/ovn_emit_need_to_frag' : value => $ovn_emit_need_to_frag; 'ovn/localnet_learn_fdb' : value => $localnet_learn_fdb; + 'ovn_nb_global/ignore_lsp_down' : value => $ignore_lsp_down; 'network_log/rate_limit' : value => $network_log_rate_limit; 'network_log/burst_limit' : value => $network_log_burst_limit; 'network_log/local_output_log_base' : value => $network_log_local_output_log_base; diff --git a/releasenotes/notes/ovn-ignore_lsp_down-c513199c93f80371.yaml b/releasenotes/notes/ovn-ignore_lsp_down-c513199c93f80371.yaml new file mode 100644 index 000000000..31554231e --- /dev/null +++ b/releasenotes/notes/ovn-ignore_lsp_down-c513199c93f80371.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``neutron::plugins::ml2::ovn::ignore_lsp_down`` parameter has been + added. diff --git a/spec/classes/neutron_plugins_ml2_ovn_spec.rb b/spec/classes/neutron_plugins_ml2_ovn_spec.rb index 773071a78..8e1de1f59 100644 --- a/spec/classes/neutron_plugins_ml2_ovn_spec.rb +++ b/spec/classes/neutron_plugins_ml2_ovn_spec.rb @@ -29,6 +29,7 @@ describe 'neutron::plugins::ml2::ovn' do :vhostuser_socket_dir => '', :ovn_emit_need_to_frag => '', :localnet_learn_fdb => '', + :ignore_lsp_down => '', :network_log_rate_limit => '', :network_log_burst_limit => '', :network_log_local_output_log_base => '', @@ -65,6 +66,7 @@ describe 'neutron::plugins::ml2::ovn' do should contain_neutron_plugin_ml2('ovn/vhost_sock_dir').with_value(p[:vhostuser_socket_dir]) should contain_neutron_plugin_ml2('ovn/ovn_emit_need_to_frag').with_value(p[:ovn_emit_need_to_frag]) should contain_neutron_plugin_ml2('ovn/localnet_learn_fdb').with_value(p[:localnet_learn_fdb]) + should contain_neutron_plugin_ml2('ovn_nb_global/ignore_lsp_down').with_value(p[:ignore_lsp_down]) should contain_neutron_plugin_ml2('network_log/rate_limit').with_value(p[:network_log_rate_limit]) should contain_neutron_plugin_ml2('network_log/burst_limit').with_value(p[:network_log_burst_limit]) should contain_neutron_plugin_ml2('network_log/local_output_log_base').with_value(p[:network_log_local_output_log_base]) @@ -91,6 +93,7 @@ describe 'neutron::plugins::ml2::ovn' do :dns_servers => '8.8.8.8,10.10.10.10', :ovn_emit_need_to_frag => false, :localnet_learn_fdb => false, + :ignore_lsp_down => false, } end @@ -113,6 +116,7 @@ describe 'neutron::plugins::ml2::ovn' do should contain_neutron_plugin_ml2('ovn/vhost_sock_dir').with_value(p[:vhostuser_socket_dir]) should contain_neutron_plugin_ml2('ovn/ovn_emit_need_to_frag').with_value(p[:ovn_emit_need_to_frag]) should contain_neutron_plugin_ml2('ovn/localnet_learn_fdb').with_value(p[:localnet_learn_fdb]) + should contain_neutron_plugin_ml2('ovn_nb_global/ignore_lsp_down').with_value(p[:ignore_lsp_down]) should contain_neutron_plugin_ml2('network_log/rate_limit').with_value(p[:network_log_rate_limit]) should contain_neutron_plugin_ml2('network_log/burst_limit').with_value(p[:network_log_burst_limit]) should contain_neutron_plugin_ml2('network_log/local_output_log_base').with_value(p[:network_log_local_output_log_base])