From: Damien Ciabrini <dciabrin@redhat.com>
Date: Wed, 29 Jun 2016 20:36:34 +0000 (+0200)
Subject: Increase cluster sync timeout for M->N major upgrades
X-Git-Tag: opnfv-6.0.0~1912^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=017334bbb5978ed9a9c06f4595506612287c1b14;p=apex-tripleo-heat-templates.git

Increase cluster sync timeout for M->N major upgrades

Since the Liberty release, the number of services managed by pacemaker
on HA Overcloud has increased. This has an impact on
major_upgrade_controller_pacemaker_1.sh, where cluster sync timeout
value tuned for older releases is now becoming too low.

Raise the cluster sync timeout value to a sensible limit to
give pacemaker enough time to stop the cluster during major upgrade.

Change-Id: I821d354ba30ce39134982ba12a82c429faa3ce62
Closes-Bug: #1597506
---

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index 72bb81f5..2aaa84c6 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -2,7 +2,7 @@
 
 set -eu
 
-cluster_sync_timeout=600
+cluster_sync_timeout=1800
 
 if pcs status 2>&1 | grep -E '(cluster is not currently running)|(OFFLINE:)'; then
     echo_error "ERROR: upgrade cannot start with some cluster nodes being offline"