Merge "Set auth flag so ceilometer auth is enabled"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker.yaml

diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 9398d6b..28fcbd6 100644 (file)
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -87,10 +87,16 @@ parameters:
         \[(?<pid>[^ ]*)\]
         (?<host>[^ ]*)
         (?<message>.*)$/
+
+  EnableLoadBalancer:
+    default: true
+    description: Whether to deploy a LoadBalancer on the Controller
+    type: boolean
+
   PacemakerResources:
     type: comma_delimited_list
     description: List of resources managed by pacemaker
-    default: ['rabbitmq','haproxy']
+    default: ['rabbitmq', 'galera']
 
 outputs:
   role_data:
@@ -136,12 +142,20 @@ outputs:
           tags: step0,validation
           pacemaker_cluster: state=online check_and_fail=true
         - name: Stop pacemaker cluster
-          tags: step1
+          tags: step2
           pacemaker_cluster: state=offline
         - name: Start pacemaker cluster
           tags: step4
           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}
+        - name: Check pacemaker haproxy resource
+          tags: step4
+          pacemaker_is_active:
+            resource: haproxy
+            max_wait: 500
+          when: {get_param: EnableLoadBalancer}