Browse Source

Merge "Add monitor interval for ovn dbs" into stable/victoria

changes/87/780887/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
a3bdc81fbd
2 changed files with 17 additions and 2 deletions
  1. +13
    -2
      manifests/profile/pacemaker/ovn_dbs_bundle.pp
  2. +4
    -0
      releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml

+ 13
- 2
manifests/profile/pacemaker/ovn_dbs_bundle.pp View File

@ -111,6 +111,14 @@
# dict called: force_vip_nic_overrides[<vip/network name>] = 'dummy'
# Defaults to hiera('tripleo::pacemaker::force_nic', undef)
#
# [*monitor_interval_master*]
# (Optional) monitor interval for ovn dbs resource
# Defaults to 10
#
# [*monitor_interval_slave*]
# (Optional) monitor interval for ovn dbs resource
# Defaults to 30
#
class tripleo::profile::pacemaker::ovn_dbs_bundle (
$ovn_dbs_docker_image = undef,
@ -134,6 +142,9 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
$listen_on_master_ip_only = 'yes',
$force_ocf = false,
$force_nic = hiera('tripleo::pacemaker::force_nic', undef),
$monitor_interval_master = 10,
$monitor_interval_slave = 30,
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@ -287,8 +298,8 @@ nb_master_protocol=ssl sb_master_protocol=ssl"
pacemaker::resource::ocf { "${ovndb_servers_resource_name}":
ocf_agent_name => "${ovndb_servers_ocf_name}",
master_params => '',
op_params => "start timeout=200s stop timeout=200s monitor interval=10s role=Master timeout=${dbs_timeout}s \
monitor interval=30s role=Slave timeout=${dbs_timeout}s",
op_params => "start timeout=200s stop timeout=200s monitor interval=${monitor_interval_master}s role=Master timeout=${dbs_timeout}s \
monitor interval=${monitor_interval_slave}s role=Slave timeout=${dbs_timeout}s",
resource_params => $resource_map,
tries => $pcs_tries,
location_rule => $ovn_dbs_location_rule,


+ 4
- 0
releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml View File

@ -0,0 +1,4 @@
---
features:
- |
Add parameter for setting monitor interval for ovndbs (default is 30s)

Loading…
Cancel
Save