diff --git a/manifests/profile/pacemaker/ovn_dbs_bundle.pp b/manifests/profile/pacemaker/ovn_dbs_bundle.pp index 8cce87186..4e4c5543a 100644 --- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp +++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp @@ -96,32 +96,26 @@ # as MASTER_IP; set to no when using external LB VIP. # Defaults to 'yes' # -# [*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 ( - $ovn_dbs_docker_image = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image', undef), - $ovn_dbs_control_port = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::control_port', '3125'), - $bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name'), - $step = Integer(hiera('step')), - $pcs_tries = hiera('pcs_tries', 20), - $ovn_dbs_vip = hiera('ovn_dbs_vip'), - $nb_db_port = 6641, - $sb_db_port = 6642, - $meta_params = '', - $op_params = '', - $container_backend = 'docker', - $tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef), - $bundle_user = undef, - $log_driver = undef, - $enable_internal_tls = hiera('enable_internal_tls', false), - $ca_file = undef, - $dbs_timeout = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::dbs_timeout', 60), - $listen_on_master_ip_only = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::listen_on_master_ip_only', 'yes'), - $replication_probe_interval = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::replication_probe_interval', 60000), + $ovn_dbs_docker_image = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image', undef), + $ovn_dbs_control_port = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::control_port', '3125'), + $bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name'), + $step = Integer(hiera('step')), + $pcs_tries = hiera('pcs_tries', 20), + $ovn_dbs_vip = hiera('ovn_dbs_vip'), + $nb_db_port = 6641, + $sb_db_port = 6642, + $meta_params = '', + $op_params = '', + $container_backend = 'docker', + $tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef), + $bundle_user = undef, + $log_driver = undef, + $enable_internal_tls = hiera('enable_internal_tls', false), + $ca_file = undef, + $dbs_timeout = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::dbs_timeout', 60), + $listen_on_master_ip_only = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::listen_on_master_ip_only', 'yes'), ) { if $::hostname == downcase($bootstrap_node) { @@ -205,7 +199,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle ( $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} \ sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000 \ -listen_on_master_ip_only=${listen_on_master_ip_only} inactive_probe_interval_to_master=${replication_probe_interval}" +listen_on_master_ip_only=${listen_on_master_ip_only}" $ovn_dbs_location_rule = { resource_discovery => 'exclusive', score => 0, diff --git a/releasenotes/notes/replication_probe_interval_ovn_dbs-df22bef3bb12a0f7.yaml b/releasenotes/notes/replication_probe_interval_ovn_dbs-df22bef3bb12a0f7.yaml deleted file mode 100644 index c60312643..000000000 --- a/releasenotes/notes/replication_probe_interval_ovn_dbs-df22bef3bb12a0f7.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -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