openstack
/
puppet-tripleo
Code Issues Proposed changes

Add replication_probe_interval for ovsdbs 

Add posibilities to configure replication_probe_interval for ovsdb-server.
It configure probe interval for connection for ovsdb-server when it is
in backup mode and connects to the active ovsdb-server for replication

Change-Id: I80c2377ea0223f0003e8e0982f1bc3c1b32b6d06
This commit is contained in:
Kamil Sambor 2020-05-13 10:03:38 +02:00
parent 82cb4dfef5
commit 5ffbfbb884
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,32 +119,37 @@
# (Optional) monitor interval for ovn dbs resource # (Optional) monitor interval for ovn dbs resource
# Defaults to 30 # Defaults to 30
# #
# [*replication_probe_interval*]
# (Optional) probe interval for ovsdb-server. It configure probe interval for connection for ovsdb-server when it is
# in backup mode and connects to the active ovsdb-server for replication
# Defaults to 60000
#
class tripleo::profile::pacemaker::ovn_dbs_bundle ( class tripleo::profile::pacemaker::ovn_dbs_bundle (
$ovn_dbs_docker_image = undef, $ovn_dbs_docker_image = undef,
$ovn_dbs_control_port = 3125, $ovn_dbs_control_port = 3125,
$bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name'), $bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name'),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
$pcs_tries = hiera('pcs_tries', 20), $pcs_tries = hiera('pcs_tries', 20),
$ovn_dbs_vip = hiera('ovn_dbs_vip'), $ovn_dbs_vip = hiera('ovn_dbs_vip'),
$nb_db_port = 6641, $nb_db_port = 6641,
$sb_db_port = 6642, $sb_db_port = 6642,
$meta_params = '', $meta_params = '',
$op_params = '', $op_params = '',
$container_backend = 'docker', $container_backend = 'docker',
$tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef), $tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef),
$bundle_user = undef, $bundle_user = undef,
$log_driver = undef, $log_driver = undef,
$log_file = '/var/log/containers/stdouts/ovn-dbs-bundle.log', $log_file = '/var/log/containers/stdouts/ovn-dbs-bundle.log',
$enable_internal_tls = hiera('enable_internal_tls', false), $enable_internal_tls = hiera('enable_internal_tls', false),
$ca_file = undef, $ca_file = undef,
$dbs_timeout = 60, $dbs_timeout = 60,
$listen_on_master_ip_only = 'yes', $listen_on_master_ip_only = 'yes',
$force_ocf = false, $force_ocf = false,
$force_nic = hiera('tripleo::pacemaker::force_nic', undef), $force_nic = hiera('tripleo::pacemaker::force_nic', undef),
$monitor_interval_master = 10, $monitor_interval_master = 10,
$monitor_interval_slave = 30, $monitor_interval_slave = 30,
$replication_probe_interval = 60000,
) { ) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) { if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@ -235,7 +240,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
$ovn_dbs_vip_norm = normalize_ip_for_uri($ovn_dbs_vip) $ovn_dbs_vip_norm = normalize_ip_for_uri($ovn_dbs_vip)
$resource_params = "master_ip=${ovn_dbs_vip_norm} nb_master_port=${nb_db_port} \ $resource_params = "master_ip=${ovn_dbs_vip_norm} nb_master_port=${nb_db_port} \
sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000 \ sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000 \
listen_on_master_ip_only=${listen_on_master_ip_only}" listen_on_master_ip_only=${listen_on_master_ip_only} inactive_probe_interval_to_master=${replication_probe_interval}"
$ovn_dbs_location_rule = { $ovn_dbs_location_rule = {
resource_discovery => 'exclusive', resource_discovery => 'exclusive',
score => 0, score => 0,

6
releasenotes/notes/replication_probe_interval_ovn_dbs-df22bef3bb12a0f7.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Add posibilities to configure replication_probe_interval for ovsdb-server.
It configure probe interval for connection for ovsdb-server when it is
in backup mode and connects to the active ovsdb-server for replication