From a5c15ba7b24b135eccff5c4af6db94bfa52a69be Mon Sep 17 00:00:00 2001
From: Michele Baldessari <michele@acksyn.org>
Date: Tue, 28 Feb 2017 13:25:59 +0100
Subject: [PATCH] WIP 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/

WIP HACK TO DEBUG https://bugs.launchpad.net/tripleo/+bug/1673030
Depends-On: I242a893c17e831ffb27f55757d9640cba05624c1

Change-Id: Id71c9cb41cfd4c17685c922db2683e28ab7588fd
Closes-Bug: #1668372
(cherry picked from commit 841d30549bd27a8b5669955196e14085025dafad)
---
 puppet/services/pacemaker.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 5be58c1874..762d0092be 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}