Merge "ovn: add ovn-openflow-probe-interval var"

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"

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' }}" }

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.