openstack/puppet-tripleo
Code Issues Proposed changes

Merge "OVN HA: Set the OVN Resource Agent parameter 'inactive_probe_interval'"

Browse Source
This commit is contained in:
Zuul 2018-01-11 04:55:00 +00:00 committed by Gerrit Code Review
commit eb1c46e40a
2 changed files with 4 additions and 2 deletions
manifests/profile/pacemaker
ovn_dbs_bundle.ppovn_northd.pp

3
manifests/profile/pacemaker/ovn_dbs_bundle.pp

@ -143,7 +143,8 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
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', op_params => 'start timeout=200s stop timeout=200s',
resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} sb_master_port=${sb_db_port} manage_northd=yes", resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} \
sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000",
tries => $pcs_tries, tries => $pcs_tries,
location_rule => $ovn_dbs_location_rule, location_rule => $ovn_dbs_location_rule,
meta_params => 'notify=true container-attribute-target=host', meta_params => 'notify=true container-attribute-target=host',

3
manifests/profile/pacemaker/ovn_northd.pp

@ -81,7 +81,8 @@ class tripleo::profile::pacemaker::ovn_northd (
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', op_params => 'start timeout=200s stop timeout=200s',
resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} sb_master_port=${sb_db_port} manage_northd=yes", resource_params => "master_ip=${ovn_dbs_vip} nb_master_port=${nb_db_port} \
sb_master_port=${sb_db_port} manage_northd=yes inactive_probe_interval=180000",
tries => $pcs_tries, tries => $pcs_tries,
location_rule => { location_rule => {
resource_discovery => 'exclusive', resource_discovery => 'exclusive',