Merge "Add posibilities to set ovn_openflow_probe_interval for controller" into stable/train

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -86,6 +86,12 @@ parameters:
     type: string
     description: Specifies the default CA cert to use if TLS is used for
       services in the internal network.
+  OVNOpenflowProbeInterval:
+    description: >
+      The inactivity probe interval of the OpenFlow connection to the
+      OpenvSwitch integration bridge, in seconds.
+    type: number
+    default: 60
 
 conditions:
   force_config_drive:  {equals: [{get_param: OVNMetadataEnabled}, false]}
@@ -132,6 +138,7 @@ outputs:
             ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
             ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
             ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
+            ovn::controller::ovn_openflow_probe_interval: {get_param: OVNOpenflowProbeInterval}
             tripleo::ovn_controller::firewall_rules:
               '118 neutron vxlan networks':
                     proto: 'udp'

releasenotes/notes/ovn_openflow_probe_interval-fd99301d95aac62e.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added new heat param OVNOpenflowProbeInterval to set ovn_openflow_probe_interval
+    which is 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, by default this value is set on 60s.
+    If the value is nonzero, then it will be forced to a value of at least 5s.