From: marios <marios@redhat.com>
Date: Mon, 23 Nov 2015 18:10:45 +0000 (+0200)
Subject: Add fixup for pcs order constraints after update to new templates
X-Git-Tag: opnfv-6.0.0~2253^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8abee0148de563e9a5636fb0a5cd057036f7ab2c;p=apex-tripleo-heat-templates.git

Add fixup for pcs order constraints after update to new templates

In https://review.openstack.org/#/c/248572/ yum_update.sh
sets the pcs constraints before restarting the cluster. However
after post-update pacemaker run, the previous constraint of
neutron-server...neutron-ovs-cleanup is re-added. Explicitly
remove this before the post-update restart of certain services

Change-Id: I84dd650dcc66ce3f48926cf369b7d691014c2254
---

diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index ad3c3701..4e8b20fd 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -41,6 +41,12 @@ if [ "$pacemaker_status" = "active" -a \
      "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
      "$(hiera update_identifier)" != "nil" ]; then
 
+    #ensure neutron constraints like
+    #https://review.openstack.org/#/c/245093/
+    if  pcs constraint order show  | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then
+        pcs constraint remove order-neutron-server-clone-neutron-ovs-cleanup-clone-mandatory
+    fi
+
     pcs resource disable httpd
     check_resource httpd stopped 300
     pcs resource disable openstack-keystone