aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-02 15:16:16 +0000
committerGerrit Code Review <review@openstack.org>2017-02-02 15:16:16 +0000
commit4774913d09e62b433d99eb6aa3b04f8e3e13fa9c (patch)
tree725e71be9c19a150ae62c153c107da7515ec217d /puppet
parent2fa4a7148d125836b9f4ee470717e563022209f5 (diff)
parent48692127d09ef577b5b691fc12ccb9055b73759b (diff)
Merge "Allow the override of pacemaker::corosync::settle_tries"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/pacemaker.yaml7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index a8a9fb99..c47229f1 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -39,6 +39,12 @@ parameters:
description: The password for the 'pcsd' user for pacemaker.
hidden: true
default: ''
+ CorosyncSettleTries:
+ type: number
+ description: Number of tries for cluster settling. This has the
+ same default as the pacemaker puppet module. Override
+ to a smaller value when in need to replace a controller node.
+ default: 360
FencingConfig:
default: {}
description: |
@@ -97,6 +103,7 @@ outputs:
pacemaker::resource_defaults::defaults:
resource-stickiness: { value: INFINITY }
corosync_token_timeout: 10000
+ pacemaker::corosync::settle_tries: {get_param: CorosyncSettleTries}
tripleo.pacemaker.firewall_rules:
'130 pacemaker tcp':
proto: 'tcp'