From c6b3800f7dd4e977f3234b5482d79d0959712855 Mon Sep 17 00:00:00 2001
From: Flavio Fernandes <flaviof@redhat.com>
Date: Thu, 21 Nov 2019 15:47:03 -0500
Subject: [PATCH] Add the ability to configure ovn-remote-probe-interval

This parameter sets inactive probe interval of the JSON
session from ovn-metadata to the OVN SB database.
By default this it is 5s which not be sufficient in
loaded systems or during high control-plane activity spikes,
leading to unnecessary reconnections to OVSDB server.
Now it is extended by default to 1 min and it
is configurable.

Change-Id: Id2bbddfa664fe3ba43992ab8721ef8117475df94
---
 manifests/agents/ovn_metadata.pp                         | 8 +++++++-
 ..._metadata_remote_probe_interval-b46a8a8cb3533276.yaml | 9 +++++++++
 spec/classes/neutron_agents_ovn_metadata_spec.rb         | 1 +
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/ovn_metadata_remote_probe_interval-b46a8a8cb3533276.yaml

diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp
index 16e0027f6..5343536ed 100644
--- a/manifests/agents/ovn_metadata.pp
+++ b/manifests/agents/ovn_metadata.pp
@@ -105,7 +105,11 @@
 #   (optional) Whether to set only the specified config options
 #   in the metadata config.
 #   Defaults to false.
-
+#
+# [*ovn_remote_probe_interval*]
+#  (optional) Set probe interval, based on user configuration, value is in ms
+#  Defaults to 60000
+#
 class neutron::agents::ovn_metadata (
   $shared_secret,
   $package_ensure            = 'present',
@@ -133,6 +137,7 @@ class neutron::agents::ovn_metadata (
   $root_helper_daemon        = $::os_service_default,
   $state_path                = '/var/lib/neutron',
   $purge_config              = false,
+  $ovn_remote_probe_interval = $::os_service_default,
   ) {
 
   include ::neutron::deps
@@ -164,6 +169,7 @@ class neutron::agents::ovn_metadata (
     'ovn/ovn_sb_private_key':                 value => $ovn_sb_private_key;
     'ovn/ovn_sb_certificate':                 value => $ovn_sb_certificate;
     'ovn/ovn_sb_ca_cert':                     value => $ovn_sb_ca_cert;
+    'ovn/ovn_remote_probe_interval':          value => $ovn_remote_probe_interval;
   }
 
   if $::neutron::params::ovn_metadata_agent_package {
diff --git a/releasenotes/notes/ovn_metadata_remote_probe_interval-b46a8a8cb3533276.yaml b/releasenotes/notes/ovn_metadata_remote_probe_interval-b46a8a8cb3533276.yaml
new file mode 100644
index 000000000..425839c15
--- /dev/null
+++ b/releasenotes/notes/ovn_metadata_remote_probe_interval-b46a8a8cb3533276.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    This parameter sets inactive probe interval of the JSON session
+    from ovn-metadata to the OVN SB database. By default this it
+    is 5s which not be sufficient in loaded systems or during high
+    control-plane activity spikes, leading to unnecessary reconnections
+    to OVSDB server. Now it is extended by default to 1 min and it is
+    configurable by param OVNRemoteProbeInterval.
\ No newline at end of file
diff --git a/spec/classes/neutron_agents_ovn_metadata_spec.rb b/spec/classes/neutron_agents_ovn_metadata_spec.rb
index e73536a89..df367dea1 100644
--- a/spec/classes/neutron_agents_ovn_metadata_spec.rb
+++ b/spec/classes/neutron_agents_ovn_metadata_spec.rb
@@ -67,6 +67,7 @@ describe 'neutron::agents::ovn_metadata' do
       should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>')
       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 => '<SERVICE DEFAULT>')
+      should contain_ovn_metadata_agent_config('ovn/ovn_remote_probe_interval').with(:value => '<SERVICE DEFAULT>')
     end
   end