Merge "Add posibilities to set ovndbs monitor interval" into stable/u…

…ssuri
openstack-archive · Mar 22, 2021 · c79850d · c79850d
2 parents 754046a + 7281bb0
commit c79850d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -100,6 +100,14 @@ parameters:
     default: ''
     description: Override the private key size used when creating the
                  certificate for this service
+  OVNDBSPacemakerMonitorIntervalSlave:
+    description: monitor interval for ovn dbs resource in seconds
+    type: number
+    default: 30
+  OVNDBSPacemakerMonitorIntervalMaster:
+    description: monitor interval for ovn dbs resource in seconds
+    type: number
+    default: 10
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -158,6 +166,8 @@ outputs:
           - tripleo::profile::pacemaker::ovn_dbs_bundle::dbs_timeout: {get_param: OVNDBSPacemakerTimeout}
           - tripleo::profile::pacemaker::ovn_dbs_bundle::replication_probe_interval: {get_param: OVNDBSReplicationInterval}
           - tripleo::profile::pacemaker::ovn_dbs_bundle::force_ocf: true
+          - tripleo::profile::pacemaker::ovn_dbs_bundle::monitor_interval_slave: {get_param: OVNDBSPacemakerMonitorIntervalSlave}
+          - tripleo::profile::pacemaker::ovn_dbs_bundle::monitor_interval_master: {get_param: OVNDBSPacemakerMonitorIntervalMaster}
           - tripleo::haproxy::ovn_dbs_manage_lb:
               if:
                 - use_external_load_balancer

diff --git a/releasenotes/notes/monitor_interval_ovndbs-b14c886737965300.yaml b/releasenotes/notes/monitor_interval_ovndbs-b14c886737965300.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Add posibilities to configure ovn dbs monitor interval
+    in tht by OVNDBSPacemakerMonitorInterval (default 30s).
+    Under load, this can create extra stress and since the
+    timeout has already been bumped, it makes sense to bump
+    this interval to a higher value as a trade off
+    between detecting a failure and stressing the service.