From 373ad6a6c0588c2f22b743c67cb98e05dfeabce7 Mon Sep 17 00:00:00 2001
From: Flavio Fernandes <flaviof@redhat.com>
Date: Thu, 21 Nov 2019 15:23:57 -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.

Depends-On: https://review.opendev.org/#/c/695577
Change-Id: I0ff2f1b01abc4bad74532f4954c80509c02a2375
---
 .../profile/base/neutron/ovn_metadata.pp      | 28 +++++++++++--------
 ...emote_probe_interval-6fcbdb1e2c9a9a33.yaml |  9 ++++++
 2 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/ovn_metadata_remote_probe_interval-6fcbdb1e2c9a9a33.yaml

diff --git a/manifests/profile/base/neutron/ovn_metadata.pp b/manifests/profile/base/neutron/ovn_metadata.pp
index 31dff8adf..f8d09c851 100644
--- a/manifests/profile/base/neutron/ovn_metadata.pp
+++ b/manifests/profile/base/neutron/ovn_metadata.pp
@@ -49,22 +49,28 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*ovn_remote_probe_interval*]
+#  (optional) Set probe interval, based on user configuration, value is in ms
+#  Defaults to 60000
+#
 class tripleo::profile::base::neutron::ovn_metadata (
-  $ovn_db_host             = hiera('ovn_dbs_vip'),
-  $ovn_sb_port             = hiera('ovn::southbound::port'),
-  $ovn_sb_private_key      = $::os_service_default,
-  $ovn_sb_certificate      = $::os_service_default,
-  $ovn_sb_ca_cert          = $::os_service_default,
-  $protocol                = 'tcp',
-  $step                    = Integer(hiera('step')),
+  $ovn_db_host               = hiera('ovn_dbs_vip'),
+  $ovn_sb_port               = hiera('ovn::southbound::port'),
+  $ovn_sb_private_key        = $::os_service_default,
+  $ovn_sb_certificate        = $::os_service_default,
+  $ovn_sb_ca_cert            = $::os_service_default,
+  $protocol                  = 'tcp',
+  $step                      = Integer(hiera('step')),
+  $ovn_remote_probe_interval = 60000,
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
     class { '::neutron::agents::ovn_metadata':
-        ovn_sb_connection  => join(["${protocol}", normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
-        ovn_sb_private_key => $ovn_sb_private_key,
-        ovn_sb_certificate => $ovn_sb_certificate,
-        ovn_sb_ca_cert     => $ovn_sb_ca_cert,
+        ovn_sb_connection         => join(["${protocol}", normalize_ip_for_uri($ovn_db_host), "${ovn_sb_port}"], ':'),
+        ovn_sb_private_key        => $ovn_sb_private_key,
+        ovn_sb_certificate        => $ovn_sb_certificate,
+        ovn_sb_ca_cert            => $ovn_sb_ca_cert,
+        ovn_remote_probe_interval => $ovn_remote_probe_interval,
     }
     Service<| title == 'controller' |> -> Service<| title == 'ovn-metadata' |>
   }
diff --git a/releasenotes/notes/ovn_metadata_remote_probe_interval-6fcbdb1e2c9a9a33.yaml b/releasenotes/notes/ovn_metadata_remote_probe_interval-6fcbdb1e2c9a9a33.yaml
new file mode 100644
index 000000000..425839c15
--- /dev/null
+++ b/releasenotes/notes/ovn_metadata_remote_probe_interval-6fcbdb1e2c9a9a33.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