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
This commit is contained in:
Takashi Kajinami 2024-01-16 11:31:39 +09:00
parent 37cafeb79b
commit e4a39a7a2f
3 changed files with 16 additions and 0 deletions

View File

@ -113,6 +113,11 @@
# Type: boolean # Type: boolean
# Defaults to $facts['os_service_default'] # 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*] # [*network_log_rate_limit*]
# (Optional) Maximum packets logging per second. # (Optional) Maximum packets logging per second.
# Used by logging service plugin. # Used by logging service plugin.
@ -151,6 +156,7 @@ class neutron::plugins::ml2::ovn(
$vhostuser_socket_dir = $facts['os_service_default'], $vhostuser_socket_dir = $facts['os_service_default'],
$ovn_emit_need_to_frag = $facts['os_service_default'], $ovn_emit_need_to_frag = $facts['os_service_default'],
$localnet_learn_fdb = $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_rate_limit = $facts['os_service_default'],
$network_log_burst_limit = $facts['os_service_default'], $network_log_burst_limit = $facts['os_service_default'],
$network_log_local_output_log_base = $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/vhost_sock_dir' : value => $vhostuser_socket_dir;
'ovn/ovn_emit_need_to_frag' : value => $ovn_emit_need_to_frag; 'ovn/ovn_emit_need_to_frag' : value => $ovn_emit_need_to_frag;
'ovn/localnet_learn_fdb' : value => $localnet_learn_fdb; '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/rate_limit' : value => $network_log_rate_limit;
'network_log/burst_limit' : value => $network_log_burst_limit; 'network_log/burst_limit' : value => $network_log_burst_limit;
'network_log/local_output_log_base' : value => $network_log_local_output_log_base; 'network_log/local_output_log_base' : value => $network_log_local_output_log_base;

View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``neutron::plugins::ml2::ovn::ignore_lsp_down`` parameter has been
added.

View File

@ -29,6 +29,7 @@ describe 'neutron::plugins::ml2::ovn' do
:vhostuser_socket_dir => '<SERVICE DEFAULT>', :vhostuser_socket_dir => '<SERVICE DEFAULT>',
:ovn_emit_need_to_frag => '<SERVICE DEFAULT>', :ovn_emit_need_to_frag => '<SERVICE DEFAULT>',
:localnet_learn_fdb => '<SERVICE DEFAULT>', :localnet_learn_fdb => '<SERVICE DEFAULT>',
:ignore_lsp_down => '<SERVICE DEFAULT>',
:network_log_rate_limit => '<SERVICE DEFAULT>', :network_log_rate_limit => '<SERVICE DEFAULT>',
:network_log_burst_limit => '<SERVICE DEFAULT>', :network_log_burst_limit => '<SERVICE DEFAULT>',
:network_log_local_output_log_base => '<SERVICE DEFAULT>', :network_log_local_output_log_base => '<SERVICE DEFAULT>',
@ -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/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/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/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/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/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]) 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', :dns_servers => '8.8.8.8,10.10.10.10',
:ovn_emit_need_to_frag => false, :ovn_emit_need_to_frag => false,
:localnet_learn_fdb => false, :localnet_learn_fdb => false,
:ignore_lsp_down => false,
} }
end 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/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/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/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/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/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]) should contain_neutron_plugin_ml2('network_log/local_output_log_base').with_value(p[:network_log_local_output_log_base])