openstack/puppet-tripleo
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2021-04-19 18:23:31 +00:00 committed by Gerrit Code Review
commit 6d82b4da1e
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/profile/pacemaker/ovn_dbs_bundle.pp
View File

@ -110,6 +110,15 @@
# [*force_ocf*] # [*force_ocf*]
# (optional) Use --force when creating the ocf resource via pcs # (optional) Use --force when creating the ocf resource via pcs
# Defaults to false # Defaults to false
#
# [*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 ( class tripleo::profile::pacemaker::ovn_dbs_bundle (
$ovn_dbs_docker_image = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image', undef), $ovn_dbs_docker_image = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image', undef),
@ -133,6 +142,9 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
$listen_on_master_ip_only = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::listen_on_master_ip_only', 'yes'), $listen_on_master_ip_only = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::listen_on_master_ip_only', 'yes'),
$force_nic = hiera('tripleo::pacemaker::force_nic', undef), $force_nic = hiera('tripleo::pacemaker::force_nic', undef),
$force_ocf = false, $force_ocf = false,
$monitor_interval_master = 10,
$monitor_interval_slave = 30,
) { ) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@ -274,7 +286,8 @@ nb_master_protocol=ssl sb_master_protocol=ssl"
location_rule => $ovn_dbs_location_rule, location_rule => $ovn_dbs_location_rule,
container_options => 'network=host', container_options => 'network=host',
# lint:ignore:140chars # lint:ignore:140chars
options => "${bundle_user_real}--log-driver=${log_driver_real}${log_file_real} -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}", options => "${bundle_user_real}--log-driver=${log_driver_real}${log_file_real} \
-e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS${tls_priorities_real}",
# lint:endignore # lint:endignore
run_command => '/bin/bash /usr/local/bin/kolla_start', run_command => '/bin/bash /usr/local/bin/kolla_start',
network => "control-port=${ovn_dbs_control_port}", network => "control-port=${ovn_dbs_control_port}",
@ -286,8 +299,8 @@ nb_master_protocol=ssl sb_master_protocol=ssl"
pacemaker::resource::ocf { "${ovndb_servers_resource_name}": pacemaker::resource::ocf { "${ovndb_servers_resource_name}":
ocf_agent_name => "${ovndb_servers_ocf_name}", ocf_agent_name => "${ovndb_servers_ocf_name}",
master_params => '', master_params => '',
op_params => "start timeout=200s stop timeout=200s monitor interval=10s role=Master timeout=${dbs_timeout}s \ op_params => "start timeout=200s stop timeout=200s monitor interval=${monitor_interval_master}s role=Master \
monitor interval=30s role=Slave timeout=${dbs_timeout}s", timeout=${dbs_timeout}s monitor interval=${monitor_interval_slave}s role=Slave timeout=${dbs_timeout}s",
resource_params => $resource_map, resource_params => $resource_map,
tries => $pcs_tries, tries => $pcs_tries,
location_rule => $ovn_dbs_location_rule, location_rule => $ovn_dbs_location_rule,

4
releasenotes/notes/monitor_interval_ovndbs-6af18ba7f4a17cc5.yaml Normal file
View File

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