Merge "Add mistral service support for composable upgrades" into stable/ocata

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

diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index 2b1071a..5be58c1 100644 (file)
--- a/puppet/services/pacemaker.yaml
+++ b/puppet/services/pacemaker.yaml
@@ -132,13 +132,16 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::pacemaker
       upgrade_tasks:
+        - name: Check pacemaker cluster running before upgrade
+          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=200
+          pacemaker_resource: state=started resource={{item}} check_mode=true wait_for_resource=true timeout=500
           with_items: {get_param: PacemakerResources}