commit ca279000ed8733dd76a4f9c6306c939979139133
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Wed May 24 11:22:05 2017 +1000

    Test: PE: Assume resources on remote nodes do not need to be restarted until absolutely necessary

Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-rh-1097457.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-rh-1097457.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-rh-1097457.dot
@@ -43,6 +43,9 @@ digraph "g" {
 "FSlun3_stop_0 lamaVM2" -> "all_stopped" [ style = bold]
 "FSlun3_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
 "VM2_monitor_10000 lama3" [ style=bold color="green" fontcolor="black"]
+"VM2_start_0 lama3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
+"VM2_start_0 lama3" -> "FAKE4_start_0 lamaVM2" [ style = bold]
+"VM2_start_0 lama3" -> "FAKE6_start_0 lamaVM2" [ style = bold]
 "VM2_start_0 lama3" -> "FSlun3_start_0 lama2" [ style = bold]
 "VM2_start_0 lama3" -> "VM2_monitor_10000 lama3" [ style = bold]
 "VM2_start_0 lama3" -> "lamaVM2_start_0 lama3" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-rh-1097457.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-rh-1097457.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-rh-1097457.exp
@@ -173,6 +173,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="37" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="71" operation="stop" operation_key="FAKE4_stop_0"/>
       </trigger>
       <trigger>
@@ -229,6 +232,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="37" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <rsc_op id="72" operation="start" operation_key="FAKE4_start_0" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3"/>
       </trigger>
       <trigger>
@@ -285,6 +291,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="37" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="83" operation="stop" operation_key="FAKE6_stop_0" internal_operation_key="FAKE6:2_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/guest-node-host-dies.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.dot
@@ -7,12 +7,15 @@ digraph "g" {
 "Fencing_stop_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
 "all_stopped" -> "Fencing_start_0 rhel7-4" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
+"container1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold]
 "container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
 "container1_stop_0 rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold]
 "container1_stop_0 rhel7-1" -> "stonith 'reboot' lxc1" [ style = bold]
 "container1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
+"container2_start_0 rhel7-3" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "container2_start_0 rhel7-3" -> "lxc2_start_0 rhel7-3" [ style = bold]
 "container2_start_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
 "container2_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/guest-node-host-dies.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.exp
@@ -149,6 +149,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="18" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
       </trigger>
       <trigger>
@@ -174,6 +177,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="19" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
@@ -245,6 +251,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="17" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recover.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.dot
@@ -1,15 +1,7 @@
  digraph "g" {
-"all_stopped" [ style=bold color="green" fontcolor="orange"]
 "fake_monitor_10000 rhel7-alt4" [ style=bold color="green" fontcolor="black"]
-"fake_start_0 rhel7-alt4" -> "fake_monitor_10000 rhel7-alt4" [ style = bold]
-"fake_start_0 rhel7-alt4" [ style=bold color="green" fontcolor="black"]
-"fake_stop_0 rhel7-alt4" -> "all_stopped" [ style = bold]
-"fake_stop_0 rhel7-alt4" -> "fake_start_0 rhel7-alt4" [ style = bold]
-"fake_stop_0 rhel7-alt4" [ style=bold color="green" fontcolor="black"]
 "rhel7-alt4_monitor_60000 rhel7-alt1" [ style=bold color="green" fontcolor="black"]
 "rhel7-alt4_start_0 rhel7-alt1" -> "fake_monitor_10000 rhel7-alt4" [ style = bold]
-"rhel7-alt4_start_0 rhel7-alt1" -> "fake_start_0 rhel7-alt4" [ style = bold]
-"rhel7-alt4_start_0 rhel7-alt1" -> "fake_stop_0 rhel7-alt4" [ style = bold]
 "rhel7-alt4_start_0 rhel7-alt1" -> "rhel7-alt4_monitor_60000 rhel7-alt1" [ style = bold]
 "rhel7-alt4_start_0 rhel7-alt1" [ style=bold color="green" fontcolor="black"]
 "shooter_monitor_60000 rhel7-alt1" [ style=bold color="green" fontcolor="black"]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recover.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.exp
@@ -54,50 +54,6 @@
       <trigger>
         <rsc_op id="4" operation="start" operation_key="rhel7-alt4_start_0" on_node="rhel7-alt1" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="7" operation="start" operation_key="fake_start_0" on_node="rhel7-alt4" on_node_uuid="rhel7-alt4" router_node="rhel7-alt1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="5">
-    <action_set>
-      <rsc_op id="7" operation="start" operation_key="fake_start_0" on_node="rhel7-alt4" on_node_uuid="rhel7-alt4" router_node="rhel7-alt1">
-        <primitive id="fake" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-alt4" CRM_meta_on_node_uuid="rhel7-alt4" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="4" operation="start" operation_key="rhel7-alt4_start_0" on_node="rhel7-alt1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="6" operation="stop" operation_key="fake_stop_0" on_node="rhel7-alt4" on_node_uuid="rhel7-alt4" router_node="rhel7-alt1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="6">
-    <action_set>
-      <rsc_op id="6" operation="stop" operation_key="fake_stop_0" on_node="rhel7-alt4" on_node_uuid="rhel7-alt4" router_node="rhel7-alt1">
-        <primitive id="fake" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_node="rhel7-alt4" CRM_meta_on_node_uuid="rhel7-alt4" CRM_meta_timeout="20000" />
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="4" operation="start" operation_key="rhel7-alt4_start_0" on_node="rhel7-alt1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="7">
-    <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="6" operation="stop" operation_key="fake_stop_0" on_node="rhel7-alt4" on_node_uuid="rhel7-alt4" router_node="rhel7-alt1"/>
-      </trigger>
     </inputs>
   </synapse>
 </transition_graph>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.summary
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recover.summary
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover.summary
@@ -12,17 +12,13 @@ OFFLINE: [ rhel7-alt3 ]
 Transition Summary:
  * Start   shooter	(rhel7-alt1)
  * Start   rhel7-alt4	(rhel7-alt1)
- * Restart fake	(Started rhel7-alt4)
 
 Executing cluster transition:
  * Resource action: shooter         start on rhel7-alt1
  * Resource action: rhel7-alt4      start on rhel7-alt1
- * Resource action: fake            stop on rhel7-alt4
- * Pseudo action:   all_stopped
+ * Resource action: fake            monitor=10000 on rhel7-alt4
  * Resource action: shooter         monitor=60000 on rhel7-alt1
  * Resource action: rhel7-alt4      monitor=60000 on rhel7-alt1
- * Resource action: fake            start on rhel7-alt4
- * Resource action: fake            monitor=10000 on rhel7-alt4
 
 Revised cluster status:
 Node rhel7-alt2 (2): standby
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recovery.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.dot
@@ -2,87 +2,20 @@ digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"]
 "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold]
-"galera-0_start_0 controller-2" -> "galera_demote_0 galera-0" [ style = bold]
 "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold]
-"galera-0_start_0 controller-2" -> "galera_promote_0 galera-0" [ style = bold]
-"galera-0_start_0 controller-2" -> "galera_start_0 galera-0" [ style = bold]
-"galera-0_start_0 controller-2" -> "galera_stop_0 galera-0" [ style = bold]
 "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold]
 "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold]
 "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
 "galera-2_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"]
 "galera-2_start_0 controller-2" -> "galera-2_monitor_20000 controller-2" [ style = bold]
-"galera-2_start_0 controller-2" -> "galera_demote_0 galera-2" [ style = bold]
 "galera-2_start_0 controller-2" -> "galera_monitor_10000 galera-2" [ style = bold]
-"galera-2_start_0 controller-2" -> "galera_promote_0 galera-2" [ style = bold]
-"galera-2_start_0 controller-2" -> "galera_start_0 galera-2" [ style = bold]
-"galera-2_start_0 controller-2" -> "galera_stop_0 galera-2" [ style = bold]
 "galera-2_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold]
 "galera-2_stop_0 controller-1" -> "galera-2_start_0 controller-2" [ style = bold]
 "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"galera-master_demote_0" -> "galera-master_demoted_0" [ style = bold]
-"galera-master_demote_0" -> "galera_demote_0 galera-0" [ style = bold]
-"galera-master_demote_0" -> "galera_demote_0 galera-2" [ style = bold]
-"galera-master_demote_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_demoted_0" -> "galera-master_promote_0" [ style = bold]
-"galera-master_demoted_0" -> "galera-master_start_0" [ style = bold]
-"galera-master_demoted_0" -> "galera-master_stop_0" [ style = bold]
-"galera-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_promote_0" -> "galera_promote_0 galera-0" [ style = bold]
-"galera-master_promote_0" -> "galera_promote_0 galera-2" [ style = bold]
-"galera-master_promote_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_running_0" -> "galera-master_promote_0" [ style = bold]
-"galera-master_running_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_start_0" -> "galera-master_running_0" [ style = bold]
-"galera-master_start_0" -> "galera_start_0 galera-0" [ style = bold]
-"galera-master_start_0" -> "galera_start_0 galera-2" [ style = bold]
-"galera-master_start_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_stop_0" -> "galera-master_stopped_0" [ style = bold]
-"galera-master_stop_0" -> "galera_stop_0 galera-0" [ style = bold]
-"galera-master_stop_0" -> "galera_stop_0 galera-2" [ style = bold]
-"galera-master_stop_0" [ style=bold color="green" fontcolor="orange"]
-"galera-master_stopped_0" -> "galera-master_promote_0" [ style = bold]
-"galera-master_stopped_0" -> "galera-master_start_0" [ style = bold]
-"galera-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"galera_demote_0 galera-0" -> "galera-master_demoted_0" [ style = bold]
-"galera_demote_0 galera-0" -> "galera_demote_0 galera-2" [ style = bold]
-"galera_demote_0 galera-0" -> "galera_promote_0 galera-0" [ style = bold]
-"galera_demote_0 galera-0" -> "galera_stop_0 galera-0" [ style = bold]
-"galera_demote_0 galera-0" [ style=bold color="green" fontcolor="black"]
-"galera_demote_0 galera-2" -> "galera-master_demoted_0" [ style = bold]
-"galera_demote_0 galera-2" -> "galera_promote_0 galera-2" [ style = bold]
-"galera_demote_0 galera-2" -> "galera_stop_0 galera-2" [ style = bold]
-"galera_demote_0 galera-2" [ style=bold color="green" fontcolor="black"]
 "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"]
 "galera_monitor_10000 galera-2" [ style=bold color="green" fontcolor="black"]
-"galera_promote_0 galera-0" -> "galera-master_promoted_0" [ style = bold]
-"galera_promote_0 galera-0" -> "galera_monitor_10000 galera-0" [ style = bold]
-"galera_promote_0 galera-0" [ style=bold color="green" fontcolor="black"]
-"galera_promote_0 galera-2" -> "galera-master_promoted_0" [ style = bold]
-"galera_promote_0 galera-2" -> "galera_monitor_10000 galera-2" [ style = bold]
-"galera_promote_0 galera-2" -> "galera_promote_0 galera-0" [ style = bold]
-"galera_promote_0 galera-2" [ style=bold color="green" fontcolor="black"]
-"galera_start_0 galera-0" -> "galera-master_running_0" [ style = bold]
-"galera_start_0 galera-0" -> "galera_monitor_10000 galera-0" [ style = bold]
-"galera_start_0 galera-0" -> "galera_promote_0 galera-0" [ style = bold]
-"galera_start_0 galera-0" [ style=bold color="green" fontcolor="black"]
-"galera_start_0 galera-2" -> "galera-master_running_0" [ style = bold]
-"galera_start_0 galera-2" -> "galera_monitor_10000 galera-2" [ style = bold]
-"galera_start_0 galera-2" -> "galera_promote_0 galera-2" [ style = bold]
-"galera_start_0 galera-2" -> "galera_start_0 galera-0" [ style = bold]
-"galera_start_0 galera-2" [ style=bold color="green" fontcolor="black"]
-"galera_stop_0 galera-0" -> "all_stopped" [ style = bold]
-"galera_stop_0 galera-0" -> "galera-master_stopped_0" [ style = bold]
-"galera_stop_0 galera-0" -> "galera_start_0 galera-0" [ style = bold]
-"galera_stop_0 galera-0" -> "galera_stop_0 galera-2" [ style = bold]
-"galera_stop_0 galera-0" [ style=bold color="green" fontcolor="black"]
-"galera_stop_0 galera-2" -> "all_stopped" [ style = bold]
-"galera_stop_0 galera-2" -> "galera-master_stopped_0" [ style = bold]
-"galera_stop_0 galera-2" -> "galera_start_0 galera-2" [ style = bold]
-"galera_stop_0 galera-2" [ style=bold color="green" fontcolor="black"]
 "haproxy-clone_stop_0" -> "haproxy-clone_stopped_0" [ style = bold]
 "haproxy-clone_stop_0" -> "haproxy_stop_0 controller-1" [ style = bold]
 "haproxy-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
@@ -114,29 +47,11 @@ digraph "g" {
 "messaging-1_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"]
 "messaging-1_start_0 controller-2" -> "messaging-1_monitor_20000 controller-2" [ style = bold]
 "messaging-1_start_0 controller-2" -> "rabbitmq_monitor_10000 messaging-1" [ style = bold]
-"messaging-1_start_0 controller-2" -> "rabbitmq_start_0 messaging-1" [ style = bold]
-"messaging-1_start_0 controller-2" -> "rabbitmq_stop_0 messaging-1" [ style = bold]
 "messaging-1_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold]
 "messaging-1_stop_0 controller-1" -> "messaging-1_start_0 controller-2" [ style = bold]
 "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"rabbitmq-clone_running_0" [ style=bold color="green" fontcolor="orange"]
-"rabbitmq-clone_start_0" -> "rabbitmq-clone_running_0" [ style = bold]
-"rabbitmq-clone_start_0" -> "rabbitmq_start_0 messaging-1" [ style = bold]
-"rabbitmq-clone_start_0" [ style=bold color="green" fontcolor="orange"]
-"rabbitmq-clone_stop_0" -> "rabbitmq-clone_stopped_0" [ style = bold]
-"rabbitmq-clone_stop_0" -> "rabbitmq_stop_0 messaging-1" [ style = bold]
-"rabbitmq-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
-"rabbitmq-clone_stopped_0" -> "rabbitmq-clone_start_0" [ style = bold]
-"rabbitmq-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "rabbitmq_monitor_10000 messaging-1" [ style=bold color="green" fontcolor="black"]
-"rabbitmq_start_0 messaging-1" -> "rabbitmq-clone_running_0" [ style = bold]
-"rabbitmq_start_0 messaging-1" -> "rabbitmq_monitor_10000 messaging-1" [ style = bold]
-"rabbitmq_start_0 messaging-1" [ style=bold color="green" fontcolor="black"]
-"rabbitmq_stop_0 messaging-1" -> "all_stopped" [ style = bold]
-"rabbitmq_stop_0 messaging-1" -> "rabbitmq-clone_stopped_0" [ style = bold]
-"rabbitmq_stop_0 messaging-1" -> "rabbitmq_start_0 messaging-1" [ style = bold]
-"rabbitmq_stop_0 messaging-1" [ style=bold color="green" fontcolor="black"]
 "redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
 "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold]
@@ -208,14 +123,9 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "galera-0_start_0 controller-2" [ style = bold]
 "stonith_complete" -> "galera-2_start_0 controller-2" [ style = bold]
-"stonith_complete" -> "galera_promote_0 galera-0" [ style = bold]
-"stonith_complete" -> "galera_promote_0 galera-2" [ style = bold]
-"stonith_complete" -> "galera_start_0 galera-0" [ style = bold]
-"stonith_complete" -> "galera_start_0 galera-2" [ style = bold]
 "stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
 "stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold]
 "stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
 "stonith_complete" -> "messaging-1_start_0 controller-2" [ style = bold]
-"stonith_complete" -> "rabbitmq_start_0 messaging-1" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recovery.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.exp
@@ -124,44 +124,6 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="44" operation="start" operation_key="rabbitmq_start_0" internal_operation_key="rabbitmq:2_start_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-2">
-        <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_timeout="200000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="43" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="45" operation="start" operation_key="rabbitmq-clone_start_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="10">
-    <action_set>
-      <rsc_op id="43" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-1">
-        <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_timeout="200000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="47" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="11">
-    <action_set>
       <rsc_op id="20" operation="monitor" operation_key="rabbitmq_monitor_10000" internal_operation_key="rabbitmq:2_monitor_10000" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-2">
         <primitive id="rabbitmq" long-id="rabbitmq:2" class="ocf" provider="heartbeat" type="rabbitmq-cluster"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_timeout="40000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
@@ -171,152 +133,11 @@
       <trigger>
         <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
-      <trigger>
-        <rsc_op id="44" operation="start" operation_key="rabbitmq_start_0" internal_operation_key="rabbitmq:2_start_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="12" priority="1000000">
-    <action_set>
-      <pseudo_event id="48" operation="stopped" operation_key="rabbitmq-clone_stopped_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="43" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="47" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="13">
-    <action_set>
-      <pseudo_event id="47" operation="stop" operation_key="rabbitmq-clone_stop_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="14" priority="1000000">
-    <action_set>
-      <pseudo_event id="46" operation="running" operation_key="rabbitmq-clone_running_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="44" operation="start" operation_key="rabbitmq_start_0" internal_operation_key="rabbitmq:2_start_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="45" operation="start" operation_key="rabbitmq-clone_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="15">
-    <action_set>
-      <pseudo_event id="45" operation="start" operation_key="rabbitmq-clone_start_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="48" operation="stopped" operation_key="rabbitmq-clone_stopped_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <rsc_op id="56" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:1_promote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2">
-        <primitive id="galera" long-id="galera:1" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="53" operation="start" operation_key="galera_start_0" internal_operation_key="galera:1_start_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="54" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="65" operation="promote" operation_key="galera-master_promote_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
-    <action_set>
-      <rsc_op id="55" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1">
-        <primitive id="galera" long-id="galera:1" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="54" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="59" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="63" operation="stop" operation_key="galera-master_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="18">
-    <action_set>
-      <rsc_op id="54" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1">
-        <primitive id="galera" long-id="galera:1" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="58" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="67" operation="demote" operation_key="galera-master_demote_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="19">
-    <action_set>
-      <rsc_op id="53" operation="start" operation_key="galera_start_0" internal_operation_key="galera:1_start_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2">
-        <primitive id="galera" long-id="galera:1" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="55" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="61" operation="start" operation_key="galera-master_start_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="20">
+  <synapse id="10">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:1_monitor_10000" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2">
+      <rsc_op id="16" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:1_monitor_10000" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2">
         <primitive id="galera" long-id="galera:1" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
       </rsc_op>
@@ -325,105 +146,11 @@
       <trigger>
         <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
-      <trigger>
-        <rsc_op id="53" operation="start" operation_key="galera_start_0" internal_operation_key="galera:1_start_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="56" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:1_promote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="21">
-    <action_set>
-      <rsc_op id="60" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2">
-        <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="galera-0" CRM_meta_on_node_uuid="galera-0" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="56" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:1_promote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="57" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="58" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="65" operation="promote" operation_key="galera-master_promote_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
-  <synapse id="22">
-    <action_set>
-      <rsc_op id="59" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1">
-        <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_node="galera-0" CRM_meta_on_node_uuid="galera-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="58" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="63" operation="stop" operation_key="galera-master_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="23">
-    <action_set>
-      <rsc_op id="58" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1">
-        <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="false" CRM_meta_on_node="galera-0" CRM_meta_on_node_uuid="galera-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="67" operation="demote" operation_key="galera-master_demote_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="24">
-    <action_set>
-      <rsc_op id="57" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2">
-        <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="galera-0" CRM_meta_on_node_uuid="galera-0" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="53" operation="start" operation_key="galera_start_0" internal_operation_key="galera:1_start_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="59" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="61" operation="start" operation_key="galera-master_start_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="25">
+  <synapse id="11">
     <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:2_monitor_10000" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2">
+      <rsc_op id="17" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:2_monitor_10000" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2">
         <primitive id="galera" long-id="galera:2" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="galera-0" CRM_meta_on_node_uuid="galera-0" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
       </rsc_op>
@@ -432,137 +159,9 @@
       <trigger>
         <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
-      <trigger>
-        <rsc_op id="57" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="60" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="26" priority="1000000">
-    <action_set>
-      <pseudo_event id="68" operation="demoted" operation_key="galera-master_demoted_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="54" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="58" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:2_demote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="67" operation="demote" operation_key="galera-master_demote_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="27">
-    <action_set>
-      <pseudo_event id="67" operation="demote" operation_key="galera-master_demote_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="28" priority="1000000">
-    <action_set>
-      <pseudo_event id="66" operation="promoted" operation_key="galera-master_promoted_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="56" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:1_promote_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="60" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:2_promote_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2"/>
-      </trigger>
     </inputs>
   </synapse>
-  <synapse id="29">
-    <action_set>
-      <pseudo_event id="65" operation="promote" operation_key="galera-master_promote_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="62" operation="running" operation_key="galera-master_running_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="64" operation="stopped" operation_key="galera-master_stopped_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="68" operation="demoted" operation_key="galera-master_demoted_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="30" priority="1000000">
-    <action_set>
-      <pseudo_event id="64" operation="stopped" operation_key="galera-master_stopped_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="55" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="59" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="63" operation="stop" operation_key="galera-master_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="31">
-    <action_set>
-      <pseudo_event id="63" operation="stop" operation_key="galera-master_stop_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="68" operation="demoted" operation_key="galera-master_demoted_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="32" priority="1000000">
-    <action_set>
-      <pseudo_event id="62" operation="running" operation_key="galera-master_running_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="53" operation="start" operation_key="galera_start_0" internal_operation_key="galera:1_start_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="57" operation="start" operation_key="galera_start_0" internal_operation_key="galera:2_start_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-2"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="61" operation="start" operation_key="galera-master_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="33">
-    <action_set>
-      <pseudo_event id="61" operation="start" operation_key="galera-master_start_0">
-        <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="3" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="64" operation="stopped" operation_key="galera-master_stopped_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="68" operation="demoted" operation_key="galera-master_demoted_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="34" priority="1000000">
+  <synapse id="12" priority="1000000">
     <action_set>
       <pseudo_event id="134" operation="notified" operation_key="redis_notified_0" internal_operation_key="redis:0_confirmed-post_notify_stonith_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
@@ -580,7 +179,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="35" priority="1000000">
+  <synapse id="13" priority="1000000">
     <action_set>
       <pseudo_event id="133" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  wait_last_known_master="true"/>
@@ -592,7 +191,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="36">
+  <synapse id="14">
     <action_set>
       <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="redis:0 redis:1 redis:2" CRM_meta_notify_active_uname="controller-1 controller-0 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2" CRM_meta_notify_available_uname="controller-2 controller-1 controller-0" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="redis:3 redis:4 redis:5 redis:6 redis:7 redis:8" CRM_meta_notify_master_resource="redis:1" CRM_meta_notify_master_uname="controller-0" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="redis:0 redis:2" CRM_meta_notify_slave_uname="controller-1 controller-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="redis:0" CRM_meta_notify_stop_uname="controller-1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
@@ -607,7 +206,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="37">
+  <synapse id="15">
     <action_set>
       <rsc_op id="193" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:1_pre_notify_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
@@ -620,7 +219,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="38" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
       <rsc_op id="135" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:1_post_notify_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="redis" long-id="redis:1" class="ocf" provider="heartbeat" type="redis"/>
@@ -636,7 +235,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="39">
+  <synapse id="17">
     <action_set>
       <rsc_op id="194" operation="notify" operation_key="redis_pre_notify_stop_0" internal_operation_key="redis:2_pre_notify_stop_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
@@ -649,7 +248,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="40" priority="1000000">
+  <synapse id="18" priority="1000000">
     <action_set>
       <rsc_op id="136" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:2_post_notify_stop_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="redis" long-id="redis:2" class="ocf" provider="heartbeat" type="redis"/>
@@ -665,7 +264,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="41" priority="1000000">
+  <synapse id="19" priority="1000000">
     <action_set>
       <pseudo_event id="87" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
@@ -683,7 +282,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="42" priority="1000000">
+  <synapse id="20" priority="1000000">
     <action_set>
       <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
@@ -698,7 +297,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="43">
+  <synapse id="21">
     <action_set>
       <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
@@ -716,7 +315,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="22">
     <action_set>
       <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
@@ -724,7 +323,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="45" priority="1000000">
+  <synapse id="23" priority="1000000">
     <action_set>
       <pseudo_event id="83" operation="stopped" operation_key="redis-master_stopped_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
@@ -739,7 +338,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="46">
+  <synapse id="24">
     <action_set>
       <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
@@ -754,7 +353,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="47">
+  <synapse id="25">
     <action_set>
       <rsc_op id="106" operation="monitor" operation_key="ip-172.17.1.14_monitor_10000" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.1.14" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -767,7 +366,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48">
+  <synapse id="26">
     <action_set>
       <rsc_op id="105" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.1.14" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -783,7 +382,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="49">
+  <synapse id="27">
     <action_set>
       <pseudo_event id="104" operation="stop" operation_key="ip-172.17.1.14_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
@@ -798,7 +397,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="50">
+  <synapse id="28">
     <action_set>
       <rsc_op id="109" operation="monitor" operation_key="ip-172.17.1.17_monitor_10000" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.1.17" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -811,7 +410,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="51">
+  <synapse id="29">
     <action_set>
       <rsc_op id="108" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.1.17" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -827,7 +426,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="52">
+  <synapse id="30">
     <action_set>
       <pseudo_event id="107" operation="stop" operation_key="ip-172.17.1.17_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
@@ -842,7 +441,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="53">
+  <synapse id="31">
     <action_set>
       <rsc_op id="114" operation="monitor" operation_key="ip-172.17.4.11_monitor_10000" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.4.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -855,7 +454,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="54">
+  <synapse id="32">
     <action_set>
       <rsc_op id="113" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="ip-172.17.4.11" class="ocf" provider="heartbeat" type="IPaddr2"/>
@@ -871,7 +470,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="55">
+  <synapse id="33">
     <action_set>
       <pseudo_event id="112" operation="stop" operation_key="ip-172.17.4.11_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
@@ -886,7 +485,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="56">
+  <synapse id="34">
     <action_set>
       <pseudo_event id="115" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="200000" />
@@ -901,7 +500,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="57" priority="1000000">
+  <synapse id="35" priority="1000000">
     <action_set>
       <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
@@ -916,7 +515,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="58">
+  <synapse id="36">
     <action_set>
       <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0">
         <attributes CRM_meta_clone_max="9" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
@@ -928,7 +527,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="59">
+  <synapse id="37">
     <action_set>
       <rsc_op id="126" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400bbf613" class="stonith" type="fence_ipmilan"/>
@@ -937,7 +536,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="60">
+  <synapse id="38">
     <action_set>
       <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400bbf613" class="stonith" type="fence_ipmilan"/>
@@ -950,7 +549,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="61">
+  <synapse id="39">
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="stonith-fence_ipmilan-525400bbf613_monitor_60000" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400bbf613" class="stonith" type="fence_ipmilan"/>
@@ -963,7 +562,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="62">
+  <synapse id="40">
     <action_set>
       <rsc_op id="127" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400b4f6bd" class="stonith" type="fence_ipmilan"/>
@@ -972,7 +571,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="63">
+  <synapse id="41">
     <action_set>
       <rsc_op id="23" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400b4f6bd" class="stonith" type="fence_ipmilan"/>
@@ -985,7 +584,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="64">
+  <synapse id="42">
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="stonith-fence_ipmilan-525400b4f6bd_monitor_60000" on_node="controller-0" on_node_uuid="1">
         <primitive id="stonith-fence_ipmilan-525400b4f6bd" class="stonith" type="fence_ipmilan"/>
@@ -998,7 +597,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="65">
+  <synapse id="43">
     <action_set>
       <rsc_op id="130" operation="monitor" operation_key="stonith-fence_ipmilan-5254005bdbb5_monitor_60000" on_node="controller-2" on_node_uuid="3">
         <primitive id="stonith-fence_ipmilan-5254005bdbb5" class="stonith" type="fence_ipmilan"/>
@@ -1011,7 +610,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="66">
+  <synapse id="44">
     <action_set>
       <rsc_op id="129" operation="start" operation_key="stonith-fence_ipmilan-5254005bdbb5_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="stonith-fence_ipmilan-5254005bdbb5" class="stonith" type="fence_ipmilan"/>
@@ -1024,7 +623,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="67">
+  <synapse id="45">
     <action_set>
       <pseudo_event id="128" operation="stop" operation_key="stonith-fence_ipmilan-5254005bdbb5_stop_0">
         <attributes CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
@@ -1032,7 +631,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="68">
+  <synapse id="46">
     <action_set>
       <crm_event id="132" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2">
         <attributes CRM_meta_cinder_volume_role="true" CRM_meta_haproxy_role="true" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_redis_role="true" CRM_meta_stonith_action="reboot" />
@@ -1043,7 +642,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="69">
+  <synapse id="47">
     <action_set>
       <pseudo_event id="131" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
@@ -1055,7 +654,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="70">
+  <synapse id="48">
     <action_set>
       <pseudo_event id="21" operation="all_stopped" operation_key="all_stopped">
         <attributes />
@@ -1072,15 +671,6 @@
         <pseudo_event id="36" operation="stop" operation_key="galera-2_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="43" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0" on_node="messaging-1" on_node_uuid="messaging-1" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="55" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0" on_node="galera-2" on_node_uuid="galera-2" router_node="controller-1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="59" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:2_stop_0" on_node="galera-0" on_node_uuid="galera-0" router_node="controller-1"/>
-      </trigger>
-      <trigger>
         <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.summary
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recovery.summary
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recovery.summary
@@ -41,9 +41,6 @@ Transition Summary:
  * Move    messaging-1	(Started controller-1 -> controller-2)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Move    galera-2	(Started controller-1 -> controller-2)
- * Restart rabbitmq:2	(Started messaging-1)
- * Restart galera:1	(Master galera-2)
- * Restart galera:2	(Master galera-0)
  * Stop    redis:0	(controller-1)
  * Move    ip-172.17.1.14	(Started controller-1 -> controller-2)
  * Move    ip-172.17.1.17	(Started controller-1 -> controller-2)
@@ -54,8 +51,6 @@ Transition Summary:
  * Move    stonith-fence_ipmilan-5254005bdbb5	(Started controller-1 -> controller-2)
 
 Executing cluster transition:
- * Pseudo action:   rabbitmq-clone_stop_0
- * Pseudo action:   galera-master_demote_0
  * Pseudo action:   redis-master_pre_notify_stop_0
  * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
  * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
@@ -79,10 +74,9 @@ Executing cluster transition:
  * Resource action: messaging-1     start on controller-2
  * Resource action: galera-0        start on controller-2
  * Resource action: galera-2        start on controller-2
- * Resource action: rabbitmq        stop on messaging-1
- * Pseudo action:   rabbitmq-clone_stopped_0
- * Pseudo action:   rabbitmq-clone_start_0
- * Resource action: galera          demote on galera-0
+ * Resource action: rabbitmq        monitor=10000 on messaging-1
+ * Resource action: galera          monitor=10000 on galera-2
+ * Resource action: galera          monitor=10000 on galera-0
  * Pseudo action:   redis_stop_0
  * Pseudo action:   redis-master_stopped_0
  * Pseudo action:   haproxy_stop_0
@@ -91,40 +85,21 @@ Executing cluster transition:
  * Resource action: messaging-1     monitor=20000 on controller-2
  * Resource action: galera-0        monitor=20000 on controller-2
  * Resource action: galera-2        monitor=20000 on controller-2
- * Resource action: rabbitmq        start on messaging-1
- * Resource action: rabbitmq        monitor=10000 on messaging-1
- * Pseudo action:   rabbitmq-clone_running_0
- * Resource action: galera          demote on galera-2
- * Pseudo action:   galera-master_demoted_0
- * Pseudo action:   galera-master_stop_0
  * Pseudo action:   redis-master_post_notify_stopped_0
  * Pseudo action:   ip-172.17.1.14_stop_0
  * Pseudo action:   ip-172.17.1.17_stop_0
  * Pseudo action:   ip-172.17.4.11_stop_0
- * Resource action: galera          stop on galera-0
  * Resource action: redis           notify on controller-0
  * Resource action: redis           notify on controller-2
  * Pseudo action:   redis-master_confirmed-post_notify_stopped_0
  * Resource action: ip-172.17.1.14  start on controller-2
  * Resource action: ip-172.17.1.17  start on controller-2
  * Resource action: ip-172.17.4.11  start on controller-2
- * Resource action: galera          stop on galera-2
- * Pseudo action:   galera-master_stopped_0
- * Pseudo action:   galera-master_start_0
  * Pseudo action:   redis_notified_0
  * Resource action: ip-172.17.1.14  monitor=10000 on controller-2
  * Resource action: ip-172.17.1.17  monitor=10000 on controller-2
  * Resource action: ip-172.17.4.11  monitor=10000 on controller-2
  * Pseudo action:   all_stopped
- * Resource action: galera          start on galera-2
- * Resource action: galera          start on galera-0
- * Pseudo action:   galera-master_running_0
- * Pseudo action:   galera-master_promote_0
- * Resource action: galera          promote on galera-2
- * Resource action: galera          monitor=10000 on galera-2
- * Resource action: galera          promote on galera-0
- * Resource action: galera          monitor=10000 on galera-0
- * Pseudo action:   galera-master_promoted_0
 Using the original execution date of: 2017-05-03 13:33:24Z
 
 Revised cluster status:
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail1.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail1.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail1.dot
@@ -23,6 +23,8 @@ digraph "g" {
 "M_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
+"container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
 "container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
 "container1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 18node2" -> "all_stopped" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail1.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail1.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail1.exp
@@ -53,6 +53,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="12" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="25" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0"/>
       </trigger>
       <trigger>
@@ -160,6 +163,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="12" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="34" operation="stop" operation_key="B_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail2.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail2.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail2.dot
@@ -23,6 +23,8 @@ digraph "g" {
 "M_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
+"container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
 "container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
 "container1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 18node2" -> "all_stopped" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail2.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail2.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail2.exp
@@ -53,6 +53,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="12" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="25" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0"/>
       </trigger>
       <trigger>
@@ -160,6 +163,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="12" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="34" operation="stop" operation_key="B_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail3.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.dot
@@ -31,5 +31,8 @@ digraph "g" {
 "X:1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "vm_start_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ style = bold]
+"vm_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
+"vm_start_0 dvossel-laptop2" -> "W:1_start_0 18builder" [ style = bold]
+"vm_start_0 dvossel-laptop2" -> "X:1_start_0 18builder" [ style = bold]
 "vm_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 }
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail3.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.exp
@@ -17,6 +17,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="3" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+      </trigger>
+      <trigger>
         <rsc_op id="4" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
       <trigger>
@@ -58,6 +61,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="3" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="12" operation="start" operation_key="W-master_start_0"/>
       </trigger>
       <trigger>
@@ -113,6 +119,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="3" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="26" operation="start" operation_key="X-master_start_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-imply-stop-on-fence.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-imply-stop-on-fence.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-imply-stop-on-fence.dot
@@ -2,6 +2,7 @@
 "R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style=bold color="green" fontcolor="black"]
 "R-lxc-01_kiff-01_start_0 kiff-02" -> "R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style = bold]
 "R-lxc-01_kiff-01_start_0 kiff-02" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
+"R-lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
 "R-lxc-01_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
 "R-lxc-01_kiff-01_stop_0 kiff-01" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
 "R-lxc-01_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-imply-stop-on-fence.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-imply-stop-on-fence.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-imply-stop-on-fence.exp
@@ -293,6 +293,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="37" operation="start" operation_key="R-lxc-01_kiff-01_start_0" on_node="kiff-02" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="46" operation="stop" operation_key="vm-fs_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-move.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-move.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-move.dot
@@ -25,6 +25,8 @@ digraph "g" {
 "M_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
 "M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 18node2" -> "A_start_0 lxc1" [ style = bold]
+"container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
 "container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
 "container1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 18node1" -> "all_stopped" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-move.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-move.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-move.exp
@@ -34,6 +34,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="11" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <rsc_op id="22" operation="stop" operation_key="M_stop_0" internal_operation_key="M:3_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
@@ -132,6 +135,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="11" operation="start" operation_key="container1_start_0" on_node="18node2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <rsc_op id="30" operation="stop" operation_key="A_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering-move.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.dot
@@ -1,5 +1,7 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
+"container1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold]
 "container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
@@ -29,6 +31,7 @@ digraph "g" {
 "lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
+"lxc-ms_demote_0 lxc1" -> "lxc1_stop_0 rhel7-1" [ style = bold]
 "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold]
 "lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering-move.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.exp
@@ -34,6 +34,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="99" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <rsc_op id="102" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
       </trigger>
       <trigger>
@@ -85,6 +88,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="99" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+      </trigger>
+      <trigger>
         <rsc_op id="104" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-1"/>
       </trigger>
       <trigger>
@@ -270,6 +276,9 @@
         <rsc_op id="32" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
       <trigger>
+        <rsc_op id="103" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-1"/>
+      </trigger>
+      <trigger>
         <rsc_op id="104" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-1"/>
       </trigger>
     </inputs>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.dot
@@ -6,6 +6,8 @@
 "container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_monitor_0 18node3" -> "container1_start_0 18node1" [ style = bold]
 "container1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
+"container1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
+"container1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
 "container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container2_monitor_0 18node1" -> "container2_start_0 18node1" [ style = bold]
@@ -14,6 +16,7 @@
 "container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container2_monitor_0 18node3" -> "container2_start_0 18node1" [ style = bold]
 "container2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
+"container2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "container2_start_0 18node1" -> "lxc2_start_0 18node1" [ style = bold]
 "container2_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.exp
@@ -106,6 +106,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="20" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="22" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
       </trigger>
       <trigger>
@@ -131,6 +134,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="20" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
@@ -238,6 +244,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="21" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="26" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-nested-group.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-nested-group.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-nested-group.dot
@@ -17,6 +17,9 @@
 "container_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"]
 "container_start_0 c7auto1" -> "c7auto4_start_0 c7auto1" [ style = bold]
 "container_start_0 c7auto1" -> "container_monitor_10000 c7auto1" [ style = bold]
+"container_start_0 c7auto1" -> "fake2_start_0 c7auto4" [ style = bold]
+"container_start_0 c7auto1" -> "fake5_start_0 c7auto4" [ style = bold]
+"container_start_0 c7auto1" -> "fake:2_start_0 c7auto4" [ style = bold]
 "container_start_0 c7auto1" -> "fake_group_running_0" [ style = bold]
 "container_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
 "fake1_monitor_0 c7auto1" -> "fake1_start_0 c7auto3" [ style = bold]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-nested-group.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-nested-group.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-nested-group.exp
@@ -92,6 +92,9 @@
         <rsc_op id="20" operation="monitor" operation_key="fake2_monitor_0" on_node="c7auto3" on_node_uuid="3"/>
       </trigger>
       <trigger>
+        <rsc_op id="53" operation="start" operation_key="container_start_0" on_node="c7auto1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <rsc_op id="59" operation="start" operation_key="c7auto4_start_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
     </inputs>
@@ -275,6 +278,9 @@
         <rsc_op id="23" operation="monitor" operation_key="fake5_monitor_0" on_node="c7auto3" on_node_uuid="3"/>
       </trigger>
       <trigger>
+        <rsc_op id="53" operation="start" operation_key="container_start_0" on_node="c7auto1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <rsc_op id="59" operation="start" operation_key="c7auto4_start_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
     </inputs>
@@ -404,6 +410,9 @@
         <pseudo_event id="47" operation="start" operation_key="fake_clone_start_0"/>
       </trigger>
       <trigger>
+        <rsc_op id="53" operation="start" operation_key="container_start_0" on_node="c7auto1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <rsc_op id="59" operation="start" operation_key="c7auto4_start_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
     </inputs>
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-start.dot
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-start.dot
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-start.dot
@@ -20,6 +20,8 @@ digraph "g" {
 "M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold]
 "M_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_start_0 18node1" -> "A_start_0 lxc1" [ style = bold]
+"container1_start_0 18node1" -> "M_start_0 lxc1" [ style = bold]
 "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
 "container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"]
Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-start.exp
===================================================================
--- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-start.exp
+++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-start.exp
@@ -33,6 +33,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="11" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <pseudo_event id="26" operation="start" operation_key="M-clone_start_0"/>
       </trigger>
       <trigger>
@@ -88,6 +91,9 @@
     </action_set>
     <inputs>
       <trigger>
+        <rsc_op id="11" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
         <rsc_op id="30" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
