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

This commit is contained in:
Zuul 2019-10-29 03:26:24 +00:00 committed by Gerrit Code Review
commit f3c2cc05f9
2 changed files with 15 additions and 0 deletions

View File

@ -66,6 +66,12 @@ parameters:
description: Probe interval in ms description: Probe interval in ms
type: number type: number
default: 60000 default: 60000
OVNOpenflowProbeInterval:
description: >
The inactivity probe interval of the OpenFlow connection to the
OpenvSwitch integration bridge, in seconds.
type: number
default: 60
resources: resources:
# Merging role-specific parameters (RoleParameters) with the default parameters. # Merging role-specific parameters (RoleParameters) with the default parameters.
@ -107,6 +113,7 @@ outputs:
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
nova::compute::force_config_drive: {if: [force_config_drive, true, false]} nova::compute::force_config_drive: {if: [force_config_drive, true, false]}
ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval} ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
ovn::controller::ovn_openflow_probe_interval: {get_param: OVNOpenflowProbeInterval}
tripleo.ovn_controller.firewall_rules: tripleo.ovn_controller.firewall_rules:
'118 neutron vxlan networks': '118 neutron vxlan networks':
proto: 'udp' proto: 'udp'

View File

@ -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.