From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Thu, 6 Apr 2017 14:55:08 +0000 (+0200)
Subject: Timeout early on pcs cluster status check0 during upgrade.
X-Git-Tag: opnfv-6.0.0~799^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0ea21f51a8128e536404ffd87f741443c9287593;p=apex-tripleo-heat-templates.git

Timeout early on pcs cluster status check0 during upgrade.

There is a windows for the pcs cluster status to hang forever[1].  We
add a timeout during check0 to avoid this situation.  2 minutes should
be more than enought to get all the pcsd nodes to reply.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1292858

Closes-Bug: #1680477

Change-Id: Icb3dc76e031a3d4f26294f37d169f2f61d30973e
---

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