From 491b8fb49a979cd2b08cc3f2871d6f234bf2de57 Mon Sep 17 00:00:00 2001
From: Mathias Fechner <fechner@osism.tech>
Date: Thu, 28 Apr 2022 11:22:23 +0200
Subject: [PATCH] ovn: add ovn-openflow-probe-interval var
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The inactivity probe interval of the OpenFlow  connection
to the OpenvSwitch integration bridge, in seconds. If the
value is zero, it disables the connection keepalive  fea‐
ture.

If  the  value  is  nonzero,  then it will be forced to a
value of at least 5s.

The value is set to 60 seconds by default as described in
"OVN issues in the field".

https://www.openvswitch.org/support/ovscon2019/day1/1436-OVSCON-Nouman.pdf
https://www.ovn.org/support/dist-docs/ovn-controller.8.html

Change-Id: I7066c3a8b33b482774f310c45142ac2936a5c405
---
 ansible/roles/ovn/defaults/main.yml                |  2 ++
 ansible/roles/ovn/tasks/bootstrap.yml              |  1 +
 .../notes/ovn-probe-timeouts-6b7747486d59e58e.yaml | 14 ++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml

diff --git a/ansible/roles/ovn/defaults/main.yml b/ansible/roles/ovn/defaults/main.yml
index f9e06b32b8..b65587b0c5 100644
--- a/ansible/roles/ovn/defaults/main.yml
+++ b/ansible/roles/ovn/defaults/main.yml
@@ -89,3 +89,5 @@ ovn_sb_db_extra_volumes: "{{ ovn_extra_volumes }}"
 ovn_base_mac: "52:54:00"
 # Configure OVN remote probe interval time in ms
 ovn_remote_probe_interval: "60000"
+# Configure OVN openflow interval in s
+ovn_openflow_probe_interval: "60"
diff --git a/ansible/roles/ovn/tasks/bootstrap.yml b/ansible/roles/ovn/tasks/bootstrap.yml
index 728ef1a1e6..ddb3cfa8b3 100644
--- a/ansible/roles/ovn/tasks/bootstrap.yml
+++ b/ansible/roles/ovn/tasks/bootstrap.yml
@@ -30,6 +30,7 @@
     - { name: ovn-encap-type, value: geneve }
     - { name: ovn-remote, value: "{{ ovn_sb_connection }}" }
     - { name: ovn-remote-probe-interval, value: "{{ ovn_remote_probe_interval }}" }
+    - { name: ovn-openflow-probe-interval, value: "{{ ovn_openflow_probe_interval }}" }
     - { name: ovn-bridge-mappings, value: "{{ ovn_mappings }}", state: "{{ 'present' if (inventory_hostname in groups['ovn-controller-network'] or computes_need_external_bridge | bool) else 'absent' }}" }
     - { name: ovn-chassis-mac-mappings, value: "{{ ovn_macs }}", state: "{{ 'present' if inventory_hostname in groups['ovn-controller-compute'] else 'absent' }}" }
     - { name: ovn-cms-options, value: "{{ ovn_cms_opts }}", state: "{{ 'present' if ovn_cms_opts != '' else 'absent' }}" }
diff --git a/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml b/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml
new file mode 100644
index 0000000000..bc5a82fca5
--- /dev/null
+++ b/releasenotes/notes/ovn-probe-timeouts-6b7747486d59e58e.yaml
@@ -0,0 +1,14 @@
+---
+features:
+  - |
+    For ovn added ovn-openflow-probe-interval variable, it sets
+    the inactivity probe interval of the OpenFlow  connection
+    to the OpenvSwitch integration bridge, in seconds. If the
+    value is zero, it disables the connection keepalive feature.
+    The default value is 60 seconds.
+
+upgrade:
+  - |
+    For ovn the default value of openflow-probe-interval was
+    changed to 60 seconds. Use the ovn-openflow-probe-interval
+    variable to override.