From cf26537723b54532d104ff052029beb27fc322f5 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Fri, 8 Jul 2022 13:26:13 +0530
Subject: [PATCH] [ML2 OVN] Add OVNOvsdbProbeInterval parameter

The parameter can be used to configure
`ovsdb_probe_interval` for neutron ml2 plugin
and ovn metadata agent.

Depends-On: https://review.opendev.org/c/openstack/puppet-neutron/+/849000
Depends-On: https://review.opendev.org/c/openstack/puppet-neutron/+/849462
Related-Bug: rhbz#2105312
Change-Id: I5fc94ad27205979b18c4ab8d4bcbe3a01f14d587
(cherry picked from commit 6617f0e5258dba3127cd1dfdad0049d3590ff443)
---
 deployment/neutron/neutron-plugin-ml2-ovn.yaml              | 5 +++++
 deployment/ovn/ovn-metadata-container-puppet.yaml           | 5 +++++
 ...add-param-ovn-ovsdb-probe-interval-243e66290a72eb3c.yaml | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 releasenotes/notes/add-param-ovn-ovsdb-probe-interval-243e66290a72eb3c.yaml

diff --git a/deployment/neutron/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml
index e88602976e..d7f1aee4ba 100644
--- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml
+++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml
@@ -39,6 +39,10 @@ parameters:
     description: Timeout in seconds for the OVSDB connection transaction
     type: number
     default: 180
+  OVNOvsdbProbeInterval:
+    description: Probe interval in ms for the OVSDB session
+    type: number
+    default: 60000
   OVNNeutronSyncMode:
     description: The synchronization mode of OVN with Neutron DB
     type: string
@@ -145,6 +149,7 @@ outputs:
           - ovn::southbound::port: {get_param: OVNSouthboundServerPort}
             ovn::northbound::port: {get_param: OVNNorthboundServerPort}
             neutron::plugins::ml2::ovn::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
+            neutron::plugins::ml2::ovn::ovsdb_probe_interval: {get_param: OVNOvsdbProbeInterval}
             neutron::plugins::ml2::ovn::neutron_sync_mode: {get_param: OVNNeutronSyncMode}
             neutron::plugins::ml2::ovn::ovn_metadata_enabled: {get_param: OVNMetadataEnabled}
             neutron::server::qos_notification_drivers: {get_param: OVNQosDriver}
diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml
index ebc6549122..615b2ccc15 100644
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@@ -89,6 +89,10 @@ parameters:
     description: Timeout in seconds for the OVSDB connection transaction
     type: number
     default: 180
+  OVNOvsdbProbeInterval:
+    description: Probe interval in ms for the OVSDB session
+    type: number
+    default: 60000
   MonitoringSubscriptionOvnMetadata:
     default: 'overcloud-ovn-metadata'
     type: string
@@ -175,6 +179,7 @@ outputs:
             neutron::agents::ovn_metadata::auth_tenant: 'service'
             neutron::agents::ovn_metadata::metadata_host: {get_param: [EndpointMap, NovaMetadataCellInternal, host_nobrackets]}
             neutron::agents::ovn_metadata::ovsdb_connection_timeout: {get_param: OVNDbConnectionTimeout}
+            neutron::agents::ovn_metadata::ovsdb_probe_interval: {get_param: OVNOvsdbProbeInterval}
             ovn::southbound::port: {get_param: OVNSouthboundServerPort}
             neutron::agents::ovn_metadata::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
             neutron::agents::ovn_metadata::debug:
diff --git a/releasenotes/notes/add-param-ovn-ovsdb-probe-interval-243e66290a72eb3c.yaml b/releasenotes/notes/add-param-ovn-ovsdb-probe-interval-243e66290a72eb3c.yaml
new file mode 100644
index 0000000000..3e789db7a6
--- /dev/null
+++ b/releasenotes/notes/add-param-ovn-ovsdb-probe-interval-243e66290a72eb3c.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added a new parameter `OVNOvsdbProbeInterval` to configure
+    `ovsdb_probe_interval` for neutron ml2-ovn plugin and
+    ovn metadata agent.