summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-30 08:54:29 +0000
committerGerrit Code Review <review@openstack.org>2016-06-30 08:54:29 +0000
commite60f9e262366c2c156f512d11ee77414668e0722 (patch)
tree40899a493a857c334101145475ec4ba4ab056b13
parentfa08aaf4a7752ed1749e0b69673acdb271a1c5b0 (diff)
parent017334bbb5978ed9a9c06f4595506612287c1b14 (diff)
Merge "Increase cluster sync timeout for M->N major upgrades"
-rwxr-xr-xextraconfig/tasks/major_upgrade_controller_pacemaker_1.sh2
1 files changed, 1 insertions, 1 deletions
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"