diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 77a39c5fa..7df01aa9b 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/manifests/agents/ovn_metadata.pp @@ -86,6 +86,15 @@ # (optional) Timeout in seconds for the OVSDB connection transaction # Defaults to $::os_service_default # +# [*ovsdb_retry_max_interval*] +# (optional) Max interval 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. +# # [*root_helper*] # (optional) Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. Change to "sudo" to skip the filtering and just run the command @@ -135,6 +144,8 @@ class neutron::agents::ovn_metadata ( $ovn_sb_certificate = $::os_service_default, $ovn_sb_ca_cert = $::os_service_default, $ovsdb_connection_timeout = $::os_service_default, + $ovsdb_retry_max_interval = $::os_service_default, + $ovsdb_probe_interval = $::os_service_default, $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper_daemon = $::os_service_default, $state_path = '/var/lib/neutron', @@ -175,6 +186,8 @@ class neutron::agents::ovn_metadata ( 'agent/root_helper_daemon': value => $root_helper_daemon; 'ovs/ovsdb_connection': value => $ovsdb_connection; 'ovs/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/ovn_sb_connection': value => $ovn_sb_connection; 'ovn/ovn_sb_private_key': value => $ovn_sb_private_key; 'ovn/ovn_sb_certificate': value => $ovn_sb_certificate; diff --git a/releasenotes/notes/ovn-metadata-tunning-params-9232d7638488ae0d.yaml b/releasenotes/notes/ovn-metadata-tunning-params-9232d7638488ae0d.yaml new file mode 100644 index 000000000..429f525f8 --- /dev/null +++ b/releasenotes/notes/ovn-metadata-tunning-params-9232d7638488ae0d.yaml @@ -0,0 +1,12 @@ +--- +features: + - | + The ``neutron::agents::ovn_metadata`` class now supports + the following two new parameters. + + - ``ovsdb_probe_interval`` parameter to configure + ``[ovn]ovsdb_probe_interval`` in ovn metadata agent config + file. + - ``ovsdb_retry_max_interval`` parameter to configure + ``[ovn]ovsdb_retry_max_interval`` in ovn metadata agent + config file. diff --git a/spec/classes/neutron_agents_ovn_metadata_spec.rb b/spec/classes/neutron_agents_ovn_metadata_spec.rb index c643e0843..d3b73cc72 100644 --- a/spec/classes/neutron_agents_ovn_metadata_spec.rb +++ b/spec/classes/neutron_agents_ovn_metadata_spec.rb @@ -67,6 +67,8 @@ describe 'neutron::agents::ovn_metadata' do should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '') should contain_ovn_metadata_agent_config('ovs/ovsdb_connection').with(:value => params[:ovsdb_connection]) should contain_ovn_metadata_agent_config('ovn/ovn_sb_connection').with(:value => '') + should contain_ovn_metadata_agent_config('ovn/ovsdb_retry_max_interval').with(:value => '') + should contain_ovn_metadata_agent_config('ovn/ovsdb_probe_interval').with(:value => '') end it 'installs ovn metadata agent package' do