openstack
/
puppet-neutron
Code Issues Proposed changes

ml2+ovn: Add more tunable parameters for OVN DB connections 

Change-Id: I9a93b65aa5dbf4bca934aec82aad2f7f6ab3d73c
(cherry picked from commit 85db34491e)
(cherry picked from commit 9d553d51c4)
(cherry picked from commit 4456238f97)
This commit is contained in:
Takashi Kajinami 2021-11-09 21:16:12 +09:00 committed by Miro Tomaska
parent 29e3ff1ee3
commit d7fe8f2978
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/plugins/ml2/ovn.pp
View File

@ -48,6 +48,15 @@
# (optional) Timeout in seconds for the OVSDB connection transaction
# Defaults to $::os_service_default
#
# [*ovsdb_retry_max_interval*]
# (optional) Max intervla in seconds between each retry to get the OVN NB
# and SB IDLs.
# Defaults to $::os_service_default
#
# [*ovsdb_probe_interval*]
# (optional) The probe interval for the OVSDB session in milliseconds.
# Defaults to $::os_service_default.
#
# [*neutron_sync_mode*]
# (optional) The synchronization mode of OVN with Neutron DB.
# Valid values are - 'log', 'off', 'repair'
@ -130,6 +139,8 @@ class neutron::plugins::ml2::ovn(
$ovn_sb_ca_cert = $::os_service_default,
$package_ensure = 'present',
$ovsdb_connection_timeout = $::os_service_default,
$ovsdb_retry_max_interval = $::os_service_default,
$ovsdb_probe_interval = $::os_service_default,
$neutron_sync_mode = $::os_service_default,
$ovn_l3_mode = $::os_service_default,
$vif_type = $::os_service_default,
@ -175,6 +186,8 @@ class neutron::plugins::ml2::ovn(
'ovn/ovn_sb_certificate' : value => $ovn_sb_certificate;
'ovn/ovn_sb_ca_cert' : value => $ovn_sb_ca_cert;
'ovn/ovsdb_connection_timeout' : value => $ovsdb_connection_timeout;
'ovn/ovsdb_retry_max_interval' : value => $ovsdb_retry_max_interval;
'ovn/ovsdb_probe_interval' : value => $ovsdb_probe_interval;
'ovn/neutron_sync_mode' : value => $neutron_sync_mode;
'ovn/ovn_l3_mode' : value => $ovn_l3_mode;
'ovn/vif_type' : value => $vif_type;

8
releasenotes/notes/ovn-tunables-0f917de23d4c1274.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
The ``neutron::plugins::ml2::ovn`` class now supports the following two
new parameters.
- ``ovsdb_retry_max_interval``
- ``ovsdb_probe_interval``

6
spec/classes/neutron_plugins_ml2_ovn_spec.rb
View File

@ -19,7 +19,9 @@ describe 'neutron::plugins::ml2::ovn' do
:ovn_sb_private_key => 'sb_key',
:ovn_sb_certificate => 'sb_cert',
:ovn_sb_ca_cert => 'sb_ca_cert',
:ovsdb_connection_timeout => '60',
:ovsdb_connection_timeout => 60,
:ovsdb_retry_max_interval => 180,
:ovsdb_probe_interval => 60000,
:neutron_sync_mode => 'log',
:ovn_l3_mode => true,
:vif_type => 'ovs',
@ -49,6 +51,8 @@ describe 'neutron::plugins::ml2::ovn' do
should contain_neutron_plugin_ml2('ovn/ovn_sb_certificate').with_value(params[:ovn_sb_certificate])
should contain_neutron_plugin_ml2('ovn/ovn_sb_ca_cert').with_value(params[:ovn_sb_ca_cert])
should contain_neutron_plugin_ml2('ovn/ovsdb_connection_timeout').with_value(params[:ovsdb_connection_timeout])
should contain_neutron_plugin_ml2('ovn/ovsdb_retry_max_interval').with_value(params[:ovsdb_retry_max_interval])
should contain_neutron_plugin_ml2('ovn/ovsdb_probe_interval').with_value(params[:ovsdb_probe_interval])
should contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(params[:neutron_sync_mode])
should contain_neutron_plugin_ml2('ovn/ovn_l3_mode').with_value(params[:ovn_l3_mode])
should contain_neutron_plugin_ml2('ovn/vif_type').with_value(params[:vif_type])