aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-22 15:00:00 +0000
committerGerrit Code Review <review@openstack.org>2017-05-22 15:00:00 +0000
commit0137f67f2e27b08a23fea4f0c2efb8aea4a45c40 (patch)
tree59779bf42848b453e35ba9ca94d5835f782d4aa3 /puppet
parent82d83da33667f87fb8330acbbd03924e5b756458 (diff)
parent75a5a4681eadf8eff214e81aff65c6ca13e12133 (diff)
Merge "Timeout early on pcs cluster status check0 during upgrade." into stable/ocata
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/pacemaker.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 28fcbd6f..f7a0edf8 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -141,6 +141,8 @@ outputs:
- name: Check pacemaker cluster running before upgrade
tags: step0,validation
pacemaker_cluster: state=online check_and_fail=true
+ async: 30
+ poll: 4
- name: Stop pacemaker cluster
tags: step2
pacemaker_cluster: state=offline