From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 28 Feb 2017 12:25:59 +0000 (+0100)
Subject: Upgrades: wait for galera to be settled
X-Git-Tag: opnfv-6.0.0~928^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=841d30549bd27a8b5669955196e14085025dafad;p=apex-tripleo-heat-templates.git

Upgrades: wait for galera to be settled

We also need to wait for the galera resource to settle down
before we proceed starting up with the other services.

Note that before merging this, we need to land the following
change in ansible-pacemaker:
https://review.gerrithub.io/#/c/351387/

Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd
Closes-Bug: #1668372
---

diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 5be58c18..762d0092 100644
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -90,7 +90,7 @@ parameters:
   PacemakerResources:
     type: comma_delimited_list
     description: List of resources managed by pacemaker
-    default: ['rabbitmq','haproxy']
+    default: ['rabbitmq','haproxy','galera']
 
 outputs:
   role_data:
@@ -143,5 +143,7 @@ outputs:
           pacemaker_cluster: state=online
         - name: Check pacemaker resource
           tags: step4
-          pacemaker_resource: state=started resource={{item}} check_mode=true wait_for_resource=true timeout=500
+          pacemaker_is_active:
+            resource: "{{ item }}"
+            max_wait: 500
           with_items: {get_param: PacemakerResources}