summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Bultel <mbultel@redhat.com>2016-03-24 15:06:42 +0100
committermarios <marios@redhat.com>2016-03-24 20:25:52 +0200
commit6e56f873148784ff34babf62a8ccc718e7d789d3 (patch)
tree918e3fd072ceb56bbcb3854f91fd1e844440eec5
parentc6249a1af273886fa326563dbc696af8fb561caa (diff)
Set UpdateIdentifier for upgrade converge, to prevent services down
We'd like to let the post puppet pacemaker controller services restart to happen for the convergence step so set the UpdateIdentifier. However also set the PackageUpdate to noop so the yum_update.sh doesn't happen. Since a full haproxy restart is expected, we no longer need the systemctl reload added at Iae3bad745ecdf952a7a0314fe1375d07eb47c454 so remove that too. Some more context at https://bugzilla.redhat.com/show_bug.cgi?id=1321036 Co-Authored-By: marios <marios@redhat.com> Change-Id: I31c2d97d68c97b435f63863fae2c89f18f99681d
-rw-r--r--environments/major-upgrade-pacemaker-converge.yaml4
-rwxr-xr-xextraconfig/tasks/pacemaker_resource_restart.sh6
2 files changed, 4 insertions, 6 deletions
diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml
index f023cb32..dfcb9654 100644
--- a/environments/major-upgrade-pacemaker-converge.yaml
+++ b/environments/major-upgrade-pacemaker-converge.yaml
@@ -1,2 +1,6 @@
parameter_defaults:
+ UpdateIdentifier: 'true'
UpgradeLevelNovaCompute: ''
+
+resource_registry:
+ OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index 09a452e6..b2bdc55a 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -36,9 +36,3 @@ if [ "$pacemaker_status" = "active" -a \
check_resource httpd started 800
fi
-
-if [ "$pacemaker_status" = "active" ]; then
- # TODO(marios): remove this once +bug/1561012
- # need this on all controllers:
- systemctl reload haproxy
-fi