From 04457fb95713fc8303d8f59d52872f86bdd1f191 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Jan 22 2021 12:12:32 +0000
Subject: Test: scheduler: update tests for digest fix


This has been bugging me for years!

There are still a few regression tests where fencing devices are sanitized
(i.e.  have a parameter value of "****") and yet are still restarting. These
are all correct, because either some value not marked as private (e.g. "user")
was sanitized, or they pre-date op-secure-params and op-secure-digest.

patch_name: 006-digests.patch
present_in_specfile: true
location_in_specfile: 6
squash_commits: true

---

diff --git a/cts/scheduler/asymmetrical-order-restart.dot b/cts/scheduler/asymmetrical-order-restart.dot
index d12a4a5..8bb3a93 100644
--- a/cts/scheduler/asymmetrical-order-restart.dot
+++ b/cts/scheduler/asymmetrical-order-restart.dot
@@ -1,9 +1,4 @@
  digraph "g" {
-"cesr104ipmi_monitor_60000 cesr105-p16" [ style=bold color="green" fontcolor="black"]
-"cesr104ipmi_start_0 cesr105-p16" -> "cesr104ipmi_monitor_60000 cesr105-p16" [ style = bold]
-"cesr104ipmi_start_0 cesr105-p16" [ style=bold color="green" fontcolor="black"]
-"cesr104ipmi_stop_0 cesr105-p16" -> "cesr104ipmi_start_0 cesr105-p16" [ style = bold]
-"cesr104ipmi_stop_0 cesr105-p16" [ style=bold color="green" fontcolor="black"]
 "sleep_b_monitor_10000 cesr109-p16" [ style=dashed color="red" fontcolor="black"]
 "sleep_b_start_0 cesr109-p16" -> "sleep_b_monitor_10000 cesr109-p16" [ style = dashed]
 "sleep_b_start_0 cesr109-p16" [ style=dashed color="red" fontcolor="black"]
diff --git a/cts/scheduler/asymmetrical-order-restart.exp b/cts/scheduler/asymmetrical-order-restart.exp
index bb4a2c5..c0b627a 100644
--- a/cts/scheduler/asymmetrical-order-restart.exp
+++ b/cts/scheduler/asymmetrical-order-restart.exp
@@ -1,41 +1,6 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="5" operation="stop" operation_key="cesr104ipmi_stop_0" on_node="cesr105-p16" on_node_uuid="5">
-        <primitive id="cesr104ipmi" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="cesr105-p16" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000"  ipaddr="192.168.48.21" login="admin" passwd="****" pcmk_host_list="cesr104-p16"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="1">
-    <action_set>
-      <rsc_op id="4" operation="start" operation_key="cesr104ipmi_start_0" on_node="cesr105-p16" on_node_uuid="5">
-        <primitive id="cesr104ipmi" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="cesr105-p16" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000"  ipaddr="192.168.48.21" login="admin" passwd="****" pcmk_host_list="cesr104-p16"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="5" operation="stop" operation_key="cesr104ipmi_stop_0" on_node="cesr105-p16" on_node_uuid="5"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="2">
-    <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="cesr104ipmi_monitor_60000" on_node="cesr105-p16" on_node_uuid="5">
-        <primitive id="cesr104ipmi" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="cesr105-p16" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000"  ipaddr="192.168.48.21" login="admin" passwd="****" pcmk_host_list="cesr104-p16"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="4" operation="start" operation_key="cesr104ipmi_start_0" on_node="cesr105-p16" on_node_uuid="5"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="3">
-    <action_set>
       <rsc_op id="2" operation="stop" operation_key="sleep_b_stop_0" on_node="cesr109-p16" on_node_uuid="9">
         <primitive id="sleep_b" class="ocf" provider="classe" type="anything"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="cesr109-p16" CRM_meta_on_node_uuid="9" CRM_meta_timeout="20000" binfile="/usr/bin/sleep" cmdline_options="infinity" />
diff --git a/cts/scheduler/asymmetrical-order-restart.scores b/cts/scheduler/asymmetrical-order-restart.scores
index 35fd8fe..49bb33d 100644
--- a/cts/scheduler/asymmetrical-order-restart.scores
+++ b/cts/scheduler/asymmetrical-order-restart.scores
@@ -1,4 +1,6 @@
 Allocation scores:
+Only 'private' parameters to cesr104ipmi_monitor_60000 on cesr105-p16 changed: 0:0;1167:0:0:540ff5bf-81ee-4648-97cb-e922b82b370c
+Only 'private' parameters to cesr104ipmi_start_0 on cesr105-p16 changed: 0:0;1166:0:0:540ff5bf-81ee-4648-97cb-e922b82b370c
 Using the original execution date of: 2018-08-09 18:55:41Z
 pcmk__native_allocate: cesr104ipmi allocation score on cesr105-p16: 0
 pcmk__native_allocate: cesr104ipmi allocation score on cesr109-p16: 0
diff --git a/cts/scheduler/asymmetrical-order-restart.summary b/cts/scheduler/asymmetrical-order-restart.summary
index 9e2e9fd..7811801 100644
--- a/cts/scheduler/asymmetrical-order-restart.summary
+++ b/cts/scheduler/asymmetrical-order-restart.summary
@@ -8,14 +8,12 @@ Online: [ cesr105-p16 cesr109-p16 ]
  sleep_a	(ocf::classe:anything):	 Stopped (disabled)
  sleep_b	(ocf::classe:anything):	 FAILED cesr109-p16
 
+Only 'private' parameters to cesr104ipmi_start_0 on cesr105-p16 changed: 0:0;1166:0:0:540ff5bf-81ee-4648-97cb-e922b82b370c
+Only 'private' parameters to cesr104ipmi_monitor_60000 on cesr105-p16 changed: 0:0;1167:0:0:540ff5bf-81ee-4648-97cb-e922b82b370c
 Transition Summary:
- * Restart    cesr104ipmi     ( cesr105-p16 )   due to resource definition change
  * Stop       sleep_b         ( cesr109-p16 )   due to unrunnable sleep_a start
 
 Executing cluster transition:
- * Resource action: cesr104ipmi     stop on cesr105-p16
- * Resource action: cesr104ipmi     start on cesr105-p16
- * Resource action: cesr104ipmi     monitor=60000 on cesr105-p16
  * Resource action: sleep_b         stop on cesr109-p16
 Using the original execution date of: 2018-08-09 18:55:41Z
 
diff --git a/cts/scheduler/bug-cl-5247.dot b/cts/scheduler/bug-cl-5247.dot
index 71e816f..f5d6fa3 100644
--- a/cts/scheduler/bug-cl-5247.dot
+++ b/cts/scheduler/bug-cl-5247.dot
@@ -1,22 +1,4 @@
  digraph "g" {
-"grpStonith1_running_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith1_start_0" -> "grpStonith1_running_0" [ style = bold]
-"grpStonith1_start_0" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
-"grpStonith1_start_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith1_stop_0" -> "grpStonith1_stopped_0" [ style = bold]
-"grpStonith1_stop_0" -> "prmStonith1-2_stop_0 bl460g8n4" [ style = bold]
-"grpStonith1_stop_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith1_stopped_0" -> "grpStonith1_start_0" [ style = bold]
-"grpStonith1_stopped_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith2_running_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith2_start_0" -> "grpStonith2_running_0" [ style = bold]
-"grpStonith2_start_0" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
-"grpStonith2_start_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith2_stop_0" -> "grpStonith2_stopped_0" [ style = bold]
-"grpStonith2_stop_0" -> "prmStonith2-2_stop_0 bl460g8n3" [ style = bold]
-"grpStonith2_stop_0" [ style=bold color="green" fontcolor="orange"]
-"grpStonith2_stopped_0" -> "grpStonith2_start_0" [ style = bold]
-"grpStonith2_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "master-group_running_0" [ style=bold color="green" fontcolor="orange"]
 "master-group_start_0" -> "master-group_running_0" [ style = bold]
 "master-group_start_0" -> "vip-master_start_0 pgsr01" [ style = bold]
@@ -89,27 +71,11 @@
 "pgsr02_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
 "prmDB2_stop_0 bl460g8n4" -> "stonith 'off' pgsr02" [ style = bold]
 "prmDB2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
-"prmStonith1-2_monitor_3600000 bl460g8n4" [ style=bold color="green" fontcolor="black"]
-"prmStonith1-2_start_0 bl460g8n4" -> "grpStonith1_running_0" [ style = bold]
-"prmStonith1-2_start_0 bl460g8n4" -> "prmStonith1-2_monitor_3600000 bl460g8n4" [ style = bold]
-"prmStonith1-2_start_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
-"prmStonith1-2_stop_0 bl460g8n4" -> "grpStonith1_stopped_0" [ style = bold]
-"prmStonith1-2_stop_0 bl460g8n4" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
-"prmStonith1-2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
-"prmStonith2-2_monitor_3600000 bl460g8n3" [ style=bold color="green" fontcolor="black"]
-"prmStonith2-2_start_0 bl460g8n3" -> "grpStonith2_running_0" [ style = bold]
-"prmStonith2-2_start_0 bl460g8n3" -> "prmStonith2-2_monitor_3600000 bl460g8n3" [ style = bold]
-"prmStonith2-2_start_0 bl460g8n3" [ style=bold color="green" fontcolor="black"]
-"prmStonith2-2_stop_0 bl460g8n3" -> "grpStonith2_stopped_0" [ style = bold]
-"prmStonith2-2_stop_0 bl460g8n3" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
-"prmStonith2-2_stop_0 bl460g8n3" [ style=bold color="green" fontcolor="black"]
 "stonith 'off' pgsr02" -> "master-group_stop_0" [ style = bold]
 "stonith 'off' pgsr02" -> "msPostgresql_stop_0" [ style = bold]
 "stonith 'off' pgsr02" -> "pgsql_demote_0 pgsr02" [ style = bold]
 "stonith 'off' pgsr02" -> "pgsql_post_notify_stonith_0" [ style = bold]
 "stonith 'off' pgsr02" -> "pgsql_stop_0 pgsr02" [ style = bold]
-"stonith 'off' pgsr02" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
-"stonith 'off' pgsr02" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
 "stonith 'off' pgsr02" -> "vip-master_start_0 pgsr01" [ style = bold]
 "stonith 'off' pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold]
 "stonith 'off' pgsr02" -> "vip-rep_start_0 pgsr01" [ style = bold]
diff --git a/cts/scheduler/bug-cl-5247.exp b/cts/scheduler/bug-cl-5247.exp
index 446df3b..252e65a 100644
--- a/cts/scheduler/bug-cl-5247.exp
+++ b/cts/scheduler/bug-cl-5247.exp
@@ -14,206 +14,16 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <pseudo_event id="20" operation="stopped" operation_key="grpStonith1_stopped_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="16" operation="stop" operation_key="prmStonith1-2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="19" operation="stop" operation_key="grpStonith1_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="2">
-    <action_set>
-      <pseudo_event id="19" operation="stop" operation_key="grpStonith1_stop_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="3">
-    <action_set>
-      <pseudo_event id="18" operation="running" operation_key="grpStonith1_running_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="start" operation_key="prmStonith1-2_start_0" on_node="bl460g8n4" on_node_uuid="3232261400"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="17" operation="start" operation_key="grpStonith1_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="4">
-    <action_set>
-      <pseudo_event id="17" operation="start" operation_key="grpStonith1_start_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="20" operation="stopped" operation_key="grpStonith1_stopped_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="5">
-    <action_set>
-      <rsc_op id="16" operation="stop" operation_key="prmStonith1-2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400">
-        <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="19" operation="stop" operation_key="grpStonith1_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="6">
-    <action_set>
-      <rsc_op id="8" operation="start" operation_key="prmStonith1-2_start_0" on_node="bl460g8n4" on_node_uuid="3232261400">
-        <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="16" operation="stop" operation_key="prmStonith1-2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="17" operation="start" operation_key="grpStonith1_start_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="70" operation="stonith" operation_key="stonith-pgsr02-off" on_node="pgsr02" on_node_uuid="pgsr02"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="7">
-    <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="prmStonith1-2_monitor_3600000" on_node="bl460g8n4" on_node_uuid="3232261400">
-        <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="start" operation_key="prmStonith1-2_start_0" on_node="bl460g8n4" on_node_uuid="3232261400"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="8">
-    <action_set>
-      <pseudo_event id="25" operation="stopped" operation_key="grpStonith2_stopped_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="stop" operation_key="prmStonith2-2_stop_0" on_node="bl460g8n3" on_node_uuid="3232261399"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="24" operation="stop" operation_key="grpStonith2_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="9">
-    <action_set>
-      <pseudo_event id="24" operation="stop" operation_key="grpStonith2_stop_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="10">
-    <action_set>
-      <pseudo_event id="23" operation="running" operation_key="grpStonith2_running_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="start" operation_key="prmStonith2-2_start_0" on_node="bl460g8n3" on_node_uuid="3232261399"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="22" operation="start" operation_key="grpStonith2_start_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="11">
-    <action_set>
-      <pseudo_event id="22" operation="start" operation_key="grpStonith2_start_0">
-        <attributes CRM_meta_timeout="20000" />
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="25" operation="stopped" operation_key="grpStonith2_stopped_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="12">
-    <action_set>
-      <rsc_op id="21" operation="stop" operation_key="prmStonith2-2_stop_0" on_node="bl460g8n3" on_node_uuid="3232261399">
-        <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="24" operation="stop" operation_key="grpStonith2_stop_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="13">
-    <action_set>
-      <rsc_op id="9" operation="start" operation_key="prmStonith2-2_start_0" on_node="bl460g8n3" on_node_uuid="3232261399">
-        <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="stop" operation_key="prmStonith2-2_stop_0" on_node="bl460g8n3" on_node_uuid="3232261399"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="22" operation="start" operation_key="grpStonith2_start_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="70" operation="stonith" operation_key="stonith-pgsr02-off" on_node="pgsr02" on_node_uuid="pgsr02"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="14">
-    <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="prmStonith2-2_monitor_3600000" on_node="bl460g8n3" on_node_uuid="3232261399">
-        <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="start" operation_key="prmStonith2-2_start_0" on_node="bl460g8n3" on_node_uuid="3232261399"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="15">
-    <action_set>
       <pseudo_event id="35" operation="stopped" operation_key="master-group_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
+        <rsc_op id="10" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
       </trigger>
       <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
+        <rsc_op id="11" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
       </trigger>
       <trigger>
         <pseudo_event id="26" operation="stop" operation_key="vip-master_stop_0"/>
@@ -226,7 +36,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16">
+  <synapse id="2">
     <action_set>
       <pseudo_event id="34" operation="stop" operation_key="master-group_stop_0">
         <attributes CRM_meta_timeout="20000" />
@@ -241,7 +51,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
+  <synapse id="3">
     <action_set>
       <pseudo_event id="33" operation="running" operation_key="master-group_running_0">
         <attributes CRM_meta_timeout="20000" />
@@ -259,7 +69,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="18">
+  <synapse id="4">
     <action_set>
       <pseudo_event id="32" operation="start" operation_key="master-group_start_0">
         <attributes CRM_meta_timeout="20000" />
@@ -271,7 +81,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="19">
+  <synapse id="5">
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="vip-master_monitor_10000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-master" class="ocf" provider="heartbeat" type="Dummy"/>
@@ -284,7 +94,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="20">
+  <synapse id="6">
     <action_set>
       <rsc_op id="27" operation="start" operation_key="vip-master_start_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-master" class="ocf" provider="heartbeat" type="Dummy"/>
@@ -293,7 +103,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
+        <rsc_op id="10" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
       </trigger>
       <trigger>
         <pseudo_event id="26" operation="stop" operation_key="vip-master_stop_0"/>
@@ -306,7 +116,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="21">
+  <synapse id="7">
     <action_set>
       <pseudo_event id="26" operation="stop" operation_key="vip-master_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_physical_host="bl460g8n4" CRM_meta_timeout="60000" />
@@ -314,7 +124,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
+        <rsc_op id="11" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
       </trigger>
       <trigger>
         <pseudo_event id="29" operation="stop" operation_key="vip-rep_stop_0"/>
@@ -327,16 +137,16 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="22">
+  <synapse id="8">
     <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
+      <rsc_op id="10" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-master" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_op_target_rc="7" CRM_meta_physical_host="bl460g8n3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="23">
+  <synapse id="9">
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="vip-rep_monitor_10000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-rep" class="ocf" provider="heartbeat" type="Dummy"/>
@@ -349,7 +159,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="24">
+  <synapse id="10">
     <action_set>
       <rsc_op id="30" operation="start" operation_key="vip-rep_start_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-rep" class="ocf" provider="heartbeat" type="Dummy"/>
@@ -358,7 +168,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
+        <rsc_op id="11" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
       </trigger>
       <trigger>
         <rsc_op id="27" operation="start" operation_key="vip-master_start_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
@@ -374,7 +184,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="25">
+  <synapse id="11">
     <action_set>
       <pseudo_event id="29" operation="stop" operation_key="vip-rep_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_physical_host="bl460g8n4" CRM_meta_timeout="60000" />
@@ -389,16 +199,16 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="26">
+  <synapse id="12">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
+      <rsc_op id="11" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-rep" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_op_target_rc="7" CRM_meta_physical_host="bl460g8n3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="27" priority="1000000">
+  <synapse id="13" priority="1000000">
     <action_set>
       <pseudo_event id="72" operation="notified" operation_key="pgsql_notified_0" internal_operation_key="pgsql:0_confirmed-post_notify_stonith_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="60000" />
@@ -413,7 +223,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="28" priority="1000000">
+  <synapse id="14" priority="1000000">
     <action_set>
       <pseudo_event id="71" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:0_post_notify_stonith_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="notify" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="60000" />
@@ -425,7 +235,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="29">
+  <synapse id="15">
     <action_set>
       <pseudo_event id="37" operation="stop" operation_key="pgsql_stop_0" internal_operation_key="pgsql:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_physical_host="bl460g8n4" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="300000" />
@@ -443,7 +253,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="30">
+  <synapse id="16">
     <action_set>
       <pseudo_event id="36" operation="demote" operation_key="pgsql_demote_0" internal_operation_key="pgsql:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" 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="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_physical_host="bl460g8n4" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="300000" />
@@ -458,7 +268,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="31" priority="1000000">
+  <synapse id="17" priority="1000000">
     <action_set>
       <rsc_op id="81" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
@@ -471,7 +281,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="32">
+  <synapse id="18">
     <action_set>
       <rsc_op id="80" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
@@ -484,7 +294,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="33">
+  <synapse id="19">
     <action_set>
       <rsc_op id="79" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
@@ -497,7 +307,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="34" priority="1000000">
+  <synapse id="20" priority="1000000">
     <action_set>
       <rsc_op id="73" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:1_post_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
@@ -513,7 +323,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="35">
+  <synapse id="21">
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="pgsql_monitor_9000" internal_operation_key="pgsql:1_monitor_9000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
@@ -532,7 +342,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="36" priority="1000000">
+  <synapse id="22" priority="1000000">
     <action_set>
       <pseudo_event id="66" operation="notified" operation_key="msPostgresql_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="2" 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="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -547,7 +357,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="37" priority="1000000">
+  <synapse id="23" priority="1000000">
     <action_set>
       <pseudo_event id="65" operation="notify" operation_key="msPostgresql_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="2" 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="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -562,7 +372,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="38">
+  <synapse id="24">
     <action_set>
       <pseudo_event id="64" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="2" 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="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -577,7 +387,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="39">
+  <synapse id="25">
     <action_set>
       <pseudo_event id="63" operation="notify" operation_key="msPostgresql_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="2" 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="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -585,7 +395,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="40" priority="1000000">
+  <synapse id="26" priority="1000000">
     <action_set>
       <pseudo_event id="62" operation="demoted" operation_key="msPostgresql_demoted_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -600,7 +410,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="41">
+  <synapse id="27">
     <action_set>
       <pseudo_event id="61" operation="demote" operation_key="msPostgresql_demote_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -612,7 +422,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="42" priority="1000000">
+  <synapse id="28" priority="1000000">
     <action_set>
       <pseudo_event id="54" operation="notified" operation_key="msPostgresql_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -627,7 +437,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="43" priority="1000000">
+  <synapse id="29" priority="1000000">
     <action_set>
       <pseudo_event id="53" operation="notify" operation_key="msPostgresql_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -642,7 +452,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="30">
     <action_set>
       <pseudo_event id="52" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -657,7 +467,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="31">
     <action_set>
       <pseudo_event id="51" operation="notify" operation_key="msPostgresql_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -669,7 +479,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="46" priority="1000000">
+  <synapse id="32" priority="1000000">
     <action_set>
       <pseudo_event id="50" operation="stopped" operation_key="msPostgresql_stopped_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -684,7 +494,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="47">
+  <synapse id="33">
     <action_set>
       <pseudo_event id="49" operation="stop" operation_key="msPostgresql_stop_0">
         <attributes CRM_meta_clone_max="2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
@@ -702,16 +512,16 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48">
+  <synapse id="34">
     <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="pgsr01_monitor_0" on_node="bl460g8n4" on_node_uuid="3232261400">
+      <rsc_op id="9" operation="monitor" operation_key="pgsr01_monitor_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="pgsr01" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="prmDB1" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="49">
+  <synapse id="35">
     <action_set>
       <rsc_op id="69" operation="stop" operation_key="pgsr02_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="pgsr02" class="ocf" provider="pacemaker" type="remote"/>
@@ -723,16 +533,16 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="50">
+  <synapse id="36">
     <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="pgsr02_monitor_0" on_node="bl460g8n3" on_node_uuid="3232261399">
+      <rsc_op id="8" operation="monitor" operation_key="pgsr02_monitor_0" on_node="bl460g8n3" on_node_uuid="3232261399">
         <primitive id="pgsr02" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="prmDB2" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="51">
+  <synapse id="37">
     <action_set>
       <pseudo_event id="70" operation="stonith" operation_key="stonith-pgsr02-off" on_node="pgsr02" on_node_uuid="pgsr02">
         <attributes CRM_meta_master_pgsql="10" CRM_meta_on_node="pgsr02" CRM_meta_on_node_uuid="pgsr02" CRM_meta_stonith_action="off" />
diff --git a/cts/scheduler/bug-cl-5247.scores b/cts/scheduler/bug-cl-5247.scores
index 11a0152..90c7ca6 100644
--- a/cts/scheduler/bug-cl-5247.scores
+++ b/cts/scheduler/bug-cl-5247.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to prmStonith1-2_monitor_3600000 on bl460g8n4 changed: 0:0;12:4:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith1-2_start_0 on bl460g8n4 changed: 0:0;24:3:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith2-2_monitor_3600000 on bl460g8n3 changed: 0:0;19:4:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith2-2_start_0 on bl460g8n3 changed: 0:0;30:3:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
 Using the original execution date of: 2015-08-12 02:53:40Z
 pcmk__clone_allocate: msPostgresql allocation score on bl460g8n3: -INFINITY
 pcmk__clone_allocate: msPostgresql allocation score on bl460g8n4: -INFINITY
diff --git a/cts/scheduler/bug-cl-5247.summary b/cts/scheduler/bug-cl-5247.summary
index 52664e6..9e8959f 100644
--- a/cts/scheduler/bug-cl-5247.summary
+++ b/cts/scheduler/bug-cl-5247.summary
@@ -17,21 +17,19 @@ GuestOnline: [ pgsr01:prmDB1 ]
      Masters: [ pgsr01 ]
      Stopped: [ bl460g8n3 bl460g8n4 ]
 
+Only 'private' parameters to prmStonith1-2_start_0 on bl460g8n4 changed: 0:0;24:3:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith1-2_monitor_3600000 on bl460g8n4 changed: 0:0;12:4:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith2-2_start_0 on bl460g8n3 changed: 0:0;30:3:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
+Only 'private' parameters to prmStonith2-2_monitor_3600000 on bl460g8n3 changed: 0:0;19:4:0:6cacb40a-dbbb-49b0-bac7-1794a61d2910
 Transition Summary:
  * Fence (off) pgsr02 (resource: prmDB2) 'guest is unclean'
  * Stop       prmDB2            (        bl460g8n4 )   due to node availability
- * Restart    prmStonith1-2     (        bl460g8n4 )   due to resource definition change
- * Restart    prmStonith2-2     (        bl460g8n3 )   due to resource definition change
  * Recover    vip-master        ( pgsr02 -> pgsr01 )  
  * Recover    vip-rep           ( pgsr02 -> pgsr01 )  
  * Stop       pgsql:0           (    Master pgsr02 )   due to node availability
  * Stop       pgsr02            (        bl460g8n4 )   due to node availability
 
 Executing cluster transition:
- * Pseudo action:   grpStonith1_stop_0
- * Resource action: prmStonith1-2   stop on bl460g8n4
- * Pseudo action:   grpStonith2_stop_0
- * Resource action: prmStonith2-2   stop on bl460g8n3
  * Resource action: vip-master      monitor on pgsr01
  * Resource action: vip-rep         monitor on pgsr01
  * Pseudo action:   msPostgresql_pre_notify_demote_0
@@ -39,23 +37,13 @@ Executing cluster transition:
  * Resource action: pgsr02          stop on bl460g8n4
  * Resource action: pgsr02          monitor on bl460g8n3
  * Resource action: prmDB2          stop on bl460g8n4
- * Pseudo action:   grpStonith1_stopped_0
- * Pseudo action:   grpStonith1_start_0
- * Pseudo action:   grpStonith2_stopped_0
- * Pseudo action:   grpStonith2_start_0
  * Resource action: pgsql           notify on pgsr01
  * Pseudo action:   msPostgresql_confirmed-pre_notify_demote_0
  * Pseudo action:   msPostgresql_demote_0
  * Pseudo action:   stonith-pgsr02-off on pgsr02
- * Resource action: prmStonith1-2   start on bl460g8n4
- * Resource action: prmStonith1-2   monitor=3600000 on bl460g8n4
- * Resource action: prmStonith2-2   start on bl460g8n3
- * Resource action: prmStonith2-2   monitor=3600000 on bl460g8n3
  * Pseudo action:   pgsql_post_notify_stop_0
  * Pseudo action:   pgsql_demote_0
  * Pseudo action:   msPostgresql_demoted_0
- * Pseudo action:   grpStonith1_running_0
- * Pseudo action:   grpStonith2_running_0
  * Pseudo action:   msPostgresql_post_notify_demoted_0
  * Resource action: pgsql           notify on pgsr01
  * Pseudo action:   msPostgresql_confirmed-post_notify_demoted_0
diff --git a/cts/scheduler/nested-remote-recovery.dot b/cts/scheduler/nested-remote-recovery.dot
index 02a267f..2afc6e9 100644
--- a/cts/scheduler/nested-remote-recovery.dot
+++ b/cts/scheduler/nested-remote-recovery.dot
@@ -86,49 +86,4 @@
 "stonith 'reboot' galera-bundle-0" -> "galera_promote_0 galera-bundle-0" [ style = bold]
 "stonith 'reboot' galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = bold]
 "stonith 'reboot' galera-bundle-0" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-5254000203a2_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254000203a2_start_0 controller-2" -> "stonith-fence_ipmilan-5254000203a2_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254000203a2_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254000203a2_stop_0 controller-2" -> "stonith-fence_ipmilan-5254000203a2_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254000203a2_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254002f6d57_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254002f6d57_start_0 controller-1" -> "stonith-fence_ipmilan-5254002f6d57_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254002f6d57_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254002f6d57_stop_0 controller-1" -> "stonith-fence_ipmilan-5254002f6d57_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254002f6d57_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254003296a5_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254003296a5_start_0 controller-1" -> "stonith-fence_ipmilan-5254003296a5_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254003296a5_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254003296a5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254003296a5_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254003296a5_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005f9a33_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005f9a33_start_0 controller-2" -> "stonith-fence_ipmilan-5254005f9a33_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254005f9a33_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005f9a33_stop_0 controller-2" -> "stonith-fence_ipmilan-5254005f9a33_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254005f9a33_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540065418e_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540065418e_start_0 controller-2" -> "stonith-fence_ipmilan-52540065418e_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-52540065418e_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540065418e_stop_0 controller-2" -> "stonith-fence_ipmilan-52540065418e_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-52540065418e_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540066e27e_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540066e27e_start_0 controller-1" -> "stonith-fence_ipmilan-52540066e27e_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-52540066e27e_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540066e27e_stop_0 controller-1" -> "stonith-fence_ipmilan-52540066e27e_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-52540066e27e_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540098c9ff_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540098c9ff_start_0 controller-1" -> "stonith-fence_ipmilan-52540098c9ff_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-52540098c9ff_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-52540098c9ff_stop_0 controller-1" -> "stonith-fence_ipmilan-52540098c9ff_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-52540098c9ff_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400a16c0d_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400a16c0d_start_0 controller-1" -> "stonith-fence_ipmilan-525400a16c0d_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400a16c0d_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400a16c0d_stop_0 controller-1" -> "stonith-fence_ipmilan-525400a16c0d_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400a16c0d_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400aab9d9_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400aab9d9_start_0 controller-2" -> "stonith-fence_ipmilan-525400aab9d9_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-525400aab9d9_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400aab9d9_stop_0 controller-2" -> "stonith-fence_ipmilan-525400aab9d9_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-525400aab9d9_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/nested-remote-recovery.exp b/cts/scheduler/nested-remote-recovery.exp
index 37c51c1..795a6ea 100644
--- a/cts/scheduler/nested-remote-recovery.exp
+++ b/cts/scheduler/nested-remote-recovery.exp
@@ -1,45 +1,45 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="103" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:0_monitor_10000" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="94" operation="monitor" operation_key="galera_monitor_10000" internal_operation_key="galera:0_monitor_10000" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_op_target_rc="8" CRM_meta_physical_host="database-0" CRM_meta_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_role="Master" CRM_meta_timeout="30000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" log="/var/log/mysql/mysqld.log" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="78" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="69" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="101" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="92" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="102" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="93" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="102" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="93" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="300000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" log="/var/log/mysql/mysqld.log" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="78" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="69" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="99" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="90" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="101" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="92" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="108" operation="promote" operation_key="galera-bundle-master_promote_0"/>
+        <pseudo_event id="99" operation="promote" operation_key="galera-bundle-master_promote_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="239" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
@@ -48,23 +48,23 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="101" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
+      <rsc_op id="92" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0">
         <primitive id="galera" long-id="galera:0" class="ocf" provider="heartbeat" type="galera"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_physical_host="database-0" CRM_meta_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" log="/var/log/mysql/mysqld.log" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="78" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="69" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
+        <pseudo_event id="91" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="95" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="239" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
@@ -73,121 +73,121 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="100" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
+      <pseudo_event id="91" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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_physical_host="database-0" CRM_meta_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" log="/var/log/mysql/mysqld.log" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="89" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="99" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="90" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="106" operation="stop" operation_key="galera-bundle-master_stop_0"/>
+        <pseudo_event id="97" operation="stop" operation_key="galera-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="99" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
+      <pseudo_event id="90" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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_physical_host="database-0" CRM_meta_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384" cluster_host_map="database-0:database-0.internalapi.localdomain;database-1:database-1.internalapi.localdomain;database-2:database-2.internalapi.localdomain"  enable_creation="true" log="/var/log/mysql/mysqld.log" wsrep_cluster_address="gcomm://database-0.internalapi.localdomain,database-1.internalapi.localdomain,database-2.internalapi.localdomain"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="110" operation="demote" operation_key="galera-bundle-master_demote_0"/>
+        <pseudo_event id="101" operation="demote" operation_key="galera-bundle-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5" priority="1000000">
     <action_set>
-      <pseudo_event id="111" operation="demoted" operation_key="galera-bundle-master_demoted_0">
+      <pseudo_event id="102" operation="demoted" operation_key="galera-bundle-master_demoted_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="99" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
+        <pseudo_event id="90" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="110" operation="demote" operation_key="galera-bundle-master_demote_0"/>
+        <pseudo_event id="101" operation="demote" operation_key="galera-bundle-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="110" operation="demote" operation_key="galera-bundle-master_demote_0">
+      <pseudo_event id="101" operation="demote" operation_key="galera-bundle-master_demote_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="114" operation="demote" operation_key="galera-bundle_demote_0"/>
+        <pseudo_event id="105" operation="demote" operation_key="galera-bundle_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="109" operation="promoted" operation_key="galera-bundle-master_promoted_0">
+      <pseudo_event id="100" operation="promoted" operation_key="galera-bundle-master_promoted_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="102" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="93" operation="promote" operation_key="galera_promote_0" internal_operation_key="galera:0_promote_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="108" operation="promote" operation_key="galera-bundle-master_promote_0">
+      <pseudo_event id="99" operation="promote" operation_key="galera-bundle-master_promote_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="105" operation="running" operation_key="galera-bundle-master_running_0"/>
+        <pseudo_event id="96" operation="running" operation_key="galera-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="98" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="102" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="promote" operation_key="galera-bundle_promote_0"/>
+        <pseudo_event id="103" operation="promote" operation_key="galera-bundle_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9" priority="1000000">
     <action_set>
-      <pseudo_event id="107" operation="stopped" operation_key="galera-bundle-master_stopped_0">
+      <pseudo_event id="98" operation="stopped" operation_key="galera-bundle-master_stopped_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
+        <pseudo_event id="91" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="106" operation="stop" operation_key="galera-bundle-master_stop_0"/>
+        <pseudo_event id="97" operation="stop" operation_key="galera-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="106" operation="stop" operation_key="galera-bundle-master_stop_0">
+      <pseudo_event id="97" operation="stop" operation_key="galera-bundle-master_stop_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="89" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="102" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="239" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
@@ -196,40 +196,40 @@
   </synapse>
   <synapse id="11" priority="1000000">
     <action_set>
-      <pseudo_event id="105" operation="running" operation_key="galera-bundle-master_running_0">
+      <pseudo_event id="96" operation="running" operation_key="galera-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="101" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
+        <rsc_op id="92" operation="start" operation_key="galera_start_0" internal_operation_key="galera:0_start_0" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="95" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="104" operation="start" operation_key="galera-bundle-master_start_0">
+      <pseudo_event id="95" operation="start" operation_key="galera-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="87" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="78" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="98" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="102" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
+      <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0">
         <primitive id="galera-bundle-docker-0" class="ocf" provider="heartbeat" type="docker"/>
         <attributes CRM_meta_on_node="database-0" CRM_meta_on_node_uuid="database-0" CRM_meta_timeout="20000" allow_pull="true"  force_kill="false" image="192.168.24.1:8787/rhosp13/openstack-mariadb:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/galera-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" --restart=no -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3123 -v /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:ro -v /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro -v /etc/hosts:/etc/hosts:ro -v /etc/localtime:/etc/localtime:ro -v /var/lib/mysql:/var/lib/mysql:rw -v /var/log/mariadb:/var/log/mariadb:rw -v /var/log/containers/mysql:/var/log/mysql:rw -v /dev/log:/dev/log:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/galera-bundle-0:/var/log --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
@@ -239,7 +239,7 @@
         <rsc_op id="54" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="87" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="78" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="239" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0"/>
@@ -255,10 +255,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="77" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="68" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="89" operation="stop" operation_key="galera-bundle_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="galera-bundle_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -271,29 +271,29 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="78" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="69" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0"  port="3123"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <rsc_op id="77" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="68" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="77" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="68" operation="stop" operation_key="galera-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="galera-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="galera-bundle-docker-0" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" addr="database-0"  port="3123"/>
         <downed>
@@ -312,327 +312,12 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="78" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="69" operation="start" operation_key="galera-bundle-0_start_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="230" operation="stop" operation_key="stonith-fence_ipmilan-5254005f9a33_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254005f9a33" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6238" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="20">
-    <action_set>
-      <rsc_op id="58" operation="start" operation_key="stonith-fence_ipmilan-5254005f9a33_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254005f9a33" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6238" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="230" operation="stop" operation_key="stonith-fence_ipmilan-5254005f9a33_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="21">
-    <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="stonith-fence_ipmilan-5254005f9a33_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254005f9a33" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6238" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="58" operation="start" operation_key="stonith-fence_ipmilan-5254005f9a33_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="22">
-    <action_set>
-      <rsc_op id="231" operation="stop" operation_key="stonith-fence_ipmilan-52540098c9ff_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540098c9ff" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="23">
-    <action_set>
-      <rsc_op id="63" operation="start" operation_key="stonith-fence_ipmilan-52540098c9ff_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540098c9ff" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="231" operation="stop" operation_key="stonith-fence_ipmilan-52540098c9ff_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="24">
-    <action_set>
-      <rsc_op id="35" operation="monitor" operation_key="stonith-fence_ipmilan-52540098c9ff_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540098c9ff" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="63" operation="start" operation_key="stonith-fence_ipmilan-52540098c9ff_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="25">
-    <action_set>
-      <rsc_op id="232" operation="stop" operation_key="stonith-fence_ipmilan-5254000203a2_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254000203a2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="26">
-    <action_set>
-      <rsc_op id="56" operation="start" operation_key="stonith-fence_ipmilan-5254000203a2_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254000203a2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="232" operation="stop" operation_key="stonith-fence_ipmilan-5254000203a2_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="27">
-    <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="stonith-fence_ipmilan-5254000203a2_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254000203a2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="56" operation="start" operation_key="stonith-fence_ipmilan-5254000203a2_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="28">
-    <action_set>
-      <rsc_op id="233" operation="stop" operation_key="stonith-fence_ipmilan-5254003296a5_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254003296a5" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6233" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="29">
-    <action_set>
-      <rsc_op id="62" operation="start" operation_key="stonith-fence_ipmilan-5254003296a5_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254003296a5" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6233" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="233" operation="stop" operation_key="stonith-fence_ipmilan-5254003296a5_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="30">
-    <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="stonith-fence_ipmilan-5254003296a5_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254003296a5" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6233" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="62" operation="start" operation_key="stonith-fence_ipmilan-5254003296a5_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="31">
-    <action_set>
-      <rsc_op id="234" operation="stop" operation_key="stonith-fence_ipmilan-52540066e27e_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540066e27e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="32">
-    <action_set>
-      <rsc_op id="60" operation="start" operation_key="stonith-fence_ipmilan-52540066e27e_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540066e27e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="234" operation="stop" operation_key="stonith-fence_ipmilan-52540066e27e_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="33">
-    <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="stonith-fence_ipmilan-52540066e27e_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-52540066e27e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="messaging-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="60" operation="start" operation_key="stonith-fence_ipmilan-52540066e27e_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="34">
-    <action_set>
-      <rsc_op id="235" operation="stop" operation_key="stonith-fence_ipmilan-52540065418e_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-52540065418e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="35">
-    <action_set>
-      <rsc_op id="57" operation="start" operation_key="stonith-fence_ipmilan-52540065418e_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-52540065418e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="235" operation="stop" operation_key="stonith-fence_ipmilan-52540065418e_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="36">
-    <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="stonith-fence_ipmilan-52540065418e_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-52540065418e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="57" operation="start" operation_key="stonith-fence_ipmilan-52540065418e_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="37">
-    <action_set>
-      <rsc_op id="236" operation="stop" operation_key="stonith-fence_ipmilan-525400aab9d9_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400aab9d9" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6239" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="38">
-    <action_set>
-      <rsc_op id="55" operation="start" operation_key="stonith-fence_ipmilan-525400aab9d9_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400aab9d9" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6239" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="236" operation="stop" operation_key="stonith-fence_ipmilan-525400aab9d9_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="stonith-fence_ipmilan-525400aab9d9_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400aab9d9" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6239" lanplus="true" login="admin" passwd="****" pcmk_host_list="database-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="55" operation="start" operation_key="stonith-fence_ipmilan-525400aab9d9_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="40">
-    <action_set>
-      <rsc_op id="237" operation="stop" operation_key="stonith-fence_ipmilan-525400a16c0d_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400a16c0d" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6234" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="41">
-    <action_set>
-      <rsc_op id="61" operation="start" operation_key="stonith-fence_ipmilan-525400a16c0d_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400a16c0d" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6234" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="237" operation="stop" operation_key="stonith-fence_ipmilan-525400a16c0d_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="42">
-    <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="stonith-fence_ipmilan-525400a16c0d_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400a16c0d" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6234" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="61" operation="start" operation_key="stonith-fence_ipmilan-525400a16c0d_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="43">
-    <action_set>
-      <rsc_op id="238" operation="stop" operation_key="stonith-fence_ipmilan-5254002f6d57_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254002f6d57" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="44">
-    <action_set>
-      <rsc_op id="59" operation="start" operation_key="stonith-fence_ipmilan-5254002f6d57_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254002f6d57" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="238" operation="stop" operation_key="stonith-fence_ipmilan-5254002f6d57_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="45">
-    <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="stonith-fence_ipmilan-5254002f6d57_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254002f6d57" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="59" operation="start" operation_key="stonith-fence_ipmilan-5254002f6d57_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="46">
-    <action_set>
       <pseudo_event id="239" operation="stonith" operation_key="stonith-galera-bundle-0-reboot" on_node="galera-bundle-0" on_node_uuid="galera-bundle-0">
         <attributes CRM_meta_on_node="galera-bundle-0" CRM_meta_on_node_uuid="galera-bundle-0" CRM_meta_stonith_action="reboot" />
         <downed>
@@ -646,62 +331,62 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="47" priority="1000000">
+  <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="115" operation="demoted" operation_key="galera-bundle_demoted_0">
+      <pseudo_event id="106" operation="demoted" operation_key="galera-bundle_demoted_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="111" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
+        <pseudo_event id="102" operation="demoted" operation_key="galera-bundle-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="114" operation="demote" operation_key="galera-bundle_demote_0"/>
+        <pseudo_event id="105" operation="demote" operation_key="galera-bundle_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48">
+  <synapse id="21">
     <action_set>
-      <pseudo_event id="114" operation="demote" operation_key="galera-bundle_demote_0">
+      <pseudo_event id="105" operation="demote" operation_key="galera-bundle_demote_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="49" priority="1000000">
+  <synapse id="22" priority="1000000">
     <action_set>
-      <pseudo_event id="113" operation="promoted" operation_key="galera-bundle_promoted_0">
+      <pseudo_event id="104" operation="promoted" operation_key="galera-bundle_promoted_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="109" operation="promoted" operation_key="galera-bundle-master_promoted_0"/>
+        <pseudo_event id="100" operation="promoted" operation_key="galera-bundle-master_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="50">
+  <synapse id="23">
     <action_set>
-      <pseudo_event id="112" operation="promote" operation_key="galera-bundle_promote_0">
+      <pseudo_event id="103" operation="promote" operation_key="galera-bundle_promote_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="88" operation="running" operation_key="galera-bundle_running_0"/>
+        <pseudo_event id="79" operation="running" operation_key="galera-bundle_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="90" operation="stopped" operation_key="galera-bundle_stopped_0"/>
+        <pseudo_event id="81" operation="stopped" operation_key="galera-bundle_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="115" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="106" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="51" priority="1000000">
+  <synapse id="24" priority="1000000">
     <action_set>
-      <pseudo_event id="90" operation="stopped" operation_key="galera-bundle_stopped_0">
+      <pseudo_event id="81" operation="stopped" operation_key="galera-bundle_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -710,49 +395,49 @@
         <rsc_op id="54" operation="stop" operation_key="galera-bundle-docker-0_stop_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
+        <pseudo_event id="98" operation="stopped" operation_key="galera-bundle-master_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="52">
+  <synapse id="25">
     <action_set>
-      <pseudo_event id="89" operation="stop" operation_key="galera-bundle_stop_0">
+      <pseudo_event id="80" operation="stop" operation_key="galera-bundle_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="115" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="106" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="53" priority="1000000">
+  <synapse id="26" priority="1000000">
     <action_set>
-      <pseudo_event id="88" operation="running" operation_key="galera-bundle_running_0">
+      <pseudo_event id="79" operation="running" operation_key="galera-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
+        <rsc_op id="67" operation="start" operation_key="galera-bundle-docker-0_start_0" on_node="database-0" on_node_uuid="database-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="105" operation="running" operation_key="galera-bundle-master_running_0"/>
+        <pseudo_event id="96" operation="running" operation_key="galera-bundle-master_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="54">
+  <synapse id="27">
     <action_set>
-      <pseudo_event id="87" operation="start" operation_key="galera-bundle_start_0">
+      <pseudo_event id="78" operation="start" operation_key="galera-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="90" operation="stopped" operation_key="galera-bundle_stopped_0"/>
+        <pseudo_event id="81" operation="stopped" operation_key="galera-bundle_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="115" operation="demoted" operation_key="galera-bundle_demoted_0"/>
+        <pseudo_event id="106" operation="demoted" operation_key="galera-bundle_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/cts/scheduler/nested-remote-recovery.scores b/cts/scheduler/nested-remote-recovery.scores
index e3b75dd..83ae5aa 100644
--- a/cts/scheduler/nested-remote-recovery.scores
+++ b/cts/scheduler/nested-remote-recovery.scores
@@ -1,4 +1,22 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-5254000203a2_monitor_60000 on controller-2 changed: 0:0;216:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254000203a2_start_0 on controller-2 changed: 0:0;222:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254002f6d57_monitor_60000 on controller-1 changed: 0:0;229:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254002f6d57_start_0 on controller-1 changed: 0:0;237:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254003296a5_monitor_60000 on controller-1 changed: 0:0;216:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254003296a5_start_0 on controller-1 changed: 0:0;224:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254005f9a33_monitor_60000 on controller-2 changed: 0:0;211:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254005f9a33_start_0 on controller-2 changed: 0:0;217:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-52540065418e_monitor_60000 on controller-2 changed: 0:0;223:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-52540065418e_start_0 on controller-2 changed: 0:0;229:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-52540066e27e_monitor_60000 on controller-1 changed: 0:0;219:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540066e27e_start_0 on controller-1 changed: 0:0;227:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540098c9ff_monitor_60000 on controller-1 changed: 0:0;211:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540098c9ff_start_0 on controller-1 changed: 0:0;219:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-525400a16c0d_monitor_60000 on controller-1 changed: 0:0;229:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-525400a16c0d_start_0 on controller-1 changed: 0:0;235:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-525400aab9d9_monitor_60000 on controller-2 changed: 0:0;226:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-525400aab9d9_start_0 on controller-2 changed: 0:0;232:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
 Using the original execution date of: 2018-09-11 21:23:25Z
 galera:0 promotion score on galera-bundle-0: 100
 galera:1 promotion score on galera-bundle-1: 100
diff --git a/cts/scheduler/nested-remote-recovery.summary b/cts/scheduler/nested-remote-recovery.summary
index a8552b7..fef6ba3 100644
--- a/cts/scheduler/nested-remote-recovery.summary
+++ b/cts/scheduler/nested-remote-recovery.summary
@@ -45,50 +45,32 @@ GuestOnline: [ galera-bundle-1:galera-bundle-docker-1 galera-bundle-2:galera-bun
  stonith-fence_ipmilan-525400a16c0d	(stonith:fence_ipmilan):	 Started controller-1
  stonith-fence_ipmilan-5254002f6d57	(stonith:fence_ipmilan):	 Started controller-1
 
+Only 'private' parameters to stonith-fence_ipmilan-525400aab9d9_start_0 on controller-2 changed: 0:0;232:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-525400aab9d9_monitor_60000 on controller-2 changed: 0:0;226:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254000203a2_start_0 on controller-2 changed: 0:0;222:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254000203a2_monitor_60000 on controller-2 changed: 0:0;216:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-52540065418e_start_0 on controller-2 changed: 0:0;229:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-52540065418e_monitor_60000 on controller-2 changed: 0:0;223:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254005f9a33_start_0 on controller-2 changed: 0:0;217:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254005f9a33_monitor_60000 on controller-2 changed: 0:0;211:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254002f6d57_start_0 on controller-1 changed: 0:0;237:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254002f6d57_monitor_60000 on controller-1 changed: 0:0;229:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540066e27e_start_0 on controller-1 changed: 0:0;227:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540066e27e_monitor_60000 on controller-1 changed: 0:0;219:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-525400a16c0d_start_0 on controller-1 changed: 0:0;235:1:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-525400a16c0d_monitor_60000 on controller-1 changed: 0:0;229:2:0:018a4c7f-d5cb-4ef8-85a4-031ed2cffd23
+Only 'private' parameters to stonith-fence_ipmilan-5254003296a5_start_0 on controller-1 changed: 0:0;224:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-5254003296a5_monitor_60000 on controller-1 changed: 0:0;216:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540098c9ff_start_0 on controller-1 changed: 0:0;219:1:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
+Only 'private' parameters to stonith-fence_ipmilan-52540098c9ff_monitor_60000 on controller-1 changed: 0:0;211:2:0:79eb6bb3-23ce-41d1-863c-4f68a738af58
 Transition Summary:
  * Fence (reboot) galera-bundle-0 (resource: galera-bundle-docker-0) 'guest is unclean'
  * Recover    galera-bundle-docker-0                 (             database-0 )  
  * Recover    galera-bundle-0                        (           controller-0 )  
  * Recover    galera:0                               ( Master galera-bundle-0 )  
- * Restart    stonith-fence_ipmilan-5254005f9a33     (           controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-52540098c9ff     (           controller-1 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-5254000203a2     (           controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-5254003296a5     (           controller-1 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-52540066e27e     (           controller-1 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-52540065418e     (           controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400aab9d9     (           controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400a16c0d     (           controller-1 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-5254002f6d57     (           controller-1 )   due to resource definition change
 
 Executing cluster transition:
  * Resource action: galera-bundle-0 stop on controller-0
- * Resource action: stonith-fence_ipmilan-5254005f9a33 stop on controller-2
- * Resource action: stonith-fence_ipmilan-5254005f9a33 start on controller-2
- * Resource action: stonith-fence_ipmilan-5254005f9a33 monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-52540098c9ff stop on controller-1
- * Resource action: stonith-fence_ipmilan-52540098c9ff start on controller-1
- * Resource action: stonith-fence_ipmilan-52540098c9ff monitor=60000 on controller-1
- * Resource action: stonith-fence_ipmilan-5254000203a2 stop on controller-2
- * Resource action: stonith-fence_ipmilan-5254000203a2 start on controller-2
- * Resource action: stonith-fence_ipmilan-5254000203a2 monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-5254003296a5 stop on controller-1
- * Resource action: stonith-fence_ipmilan-5254003296a5 start on controller-1
- * Resource action: stonith-fence_ipmilan-5254003296a5 monitor=60000 on controller-1
- * Resource action: stonith-fence_ipmilan-52540066e27e stop on controller-1
- * Resource action: stonith-fence_ipmilan-52540066e27e start on controller-1
- * Resource action: stonith-fence_ipmilan-52540066e27e monitor=60000 on controller-1
- * Resource action: stonith-fence_ipmilan-52540065418e stop on controller-2
- * Resource action: stonith-fence_ipmilan-52540065418e start on controller-2
- * Resource action: stonith-fence_ipmilan-52540065418e monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-525400aab9d9 stop on controller-2
- * Resource action: stonith-fence_ipmilan-525400aab9d9 start on controller-2
- * Resource action: stonith-fence_ipmilan-525400aab9d9 monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-525400a16c0d stop on controller-1
- * Resource action: stonith-fence_ipmilan-525400a16c0d start on controller-1
- * Resource action: stonith-fence_ipmilan-525400a16c0d monitor=60000 on controller-1
- * Resource action: stonith-fence_ipmilan-5254002f6d57 stop on controller-1
- * Resource action: stonith-fence_ipmilan-5254002f6d57 start on controller-1
- * Resource action: stonith-fence_ipmilan-5254002f6d57 monitor=60000 on controller-1
  * Pseudo action:   galera-bundle_demote_0
  * Pseudo action:   galera-bundle-master_demote_0
  * Pseudo action:   galera_demote_0
diff --git a/cts/scheduler/no-promote-on-unrunnable-guest.dot b/cts/scheduler/no-promote-on-unrunnable-guest.dot
index 6063640..b9696fc 100644
--- a/cts/scheduler/no-promote-on-unrunnable-guest.dot
+++ b/cts/scheduler/no-promote-on-unrunnable-guest.dot
@@ -110,19 +110,4 @@
 "ovndb_servers_stop_0 ovn-dbs-bundle-0" -> "ovn-dbs-bundle-master_stopped_0" [ style = bold]
 "ovndb_servers_stop_0 ovn-dbs-bundle-0" -> "ovndb_servers_start_0 ovn-dbs-bundle-0" [ style = dashed]
 "ovndb_servers_stop_0 ovn-dbs-bundle-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005e097a_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005e097a_start_0 controller-0" -> "stonith-fence_ipmilan-5254005e097a_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-5254005e097a_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254005e097a_stop_0 controller-0" -> "stonith-fence_ipmilan-5254005e097a_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-5254005e097a_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400985679_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400985679_start_0 controller-1" -> "stonith-fence_ipmilan-525400985679_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400985679_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400985679_stop_0 controller-1" -> "stonith-fence_ipmilan-525400985679_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400985679_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400afe30e_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400afe30e_start_0 controller-2" -> "stonith-fence_ipmilan-525400afe30e_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-525400afe30e_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400afe30e_stop_0 controller-2" -> "stonith-fence_ipmilan-525400afe30e_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-525400afe30e_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/no-promote-on-unrunnable-guest.exp b/cts/scheduler/no-promote-on-unrunnable-guest.exp
index 4417f6e..b675aed 100644
--- a/cts/scheduler/no-promote-on-unrunnable-guest.exp
+++ b/cts/scheduler/no-promote-on-unrunnable-guest.exp
@@ -8,23 +8,23 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="203" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
+        <pseudo_event id="200" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="187" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0">
+      <rsc_op id="184" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0">
         <primitive id="ovndb_servers" long-id="ovndb_servers:0" class="ocf" provider="ovn" type="ovndb-servers"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" 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="ovndb_servers:0 ovndb_servers:1 ovndb_servers:2" CRM_meta_notify_active_uname="ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="controller-0 controller-1 controller-2 ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="ovndb_servers:1" CRM_meta_notify_promote_uname="ovn-dbs-bundle-1" CRM_meta_notify_slave_resource="ovndb_servers:0 ovndb_servers:1 ovndb_servers:2" CRM_meta_notify_slave_uname="ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ovndb_servers:0" CRM_meta_notify_stop_uname="ovn-dbs-bundle-0" CRM_meta_on_node="ovn-dbs-bundle-0" CRM_meta_on_node_uuid="ovn-dbs-bundle-0" CRM_meta_physical_host="controller-0" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  inactive_probe_interval="180000" listen_on_master_ip_only="no" manage_northd="yes" master_ip="172.17.1.247" nb_master_port="6641" sb_master_port="6642"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="184" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
+        <pseudo_event id="181" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="201" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0"/>
+        <pseudo_event id="198" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -37,7 +37,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="211" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="208" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -50,7 +50,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="209" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="206" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -63,7 +63,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="205" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
+        <pseudo_event id="202" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -76,32 +76,32 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="203" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
+        <pseudo_event id="200" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="192" operation="monitor" operation_key="ovndb_servers_monitor_10000" internal_operation_key="ovndb_servers:1_monitor_10000" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1">
+      <rsc_op id="189" operation="monitor" operation_key="ovndb_servers_monitor_10000" internal_operation_key="ovndb_servers:1_monitor_10000" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1">
         <primitive id="ovndb_servers" long-id="ovndb_servers:1" class="ocf" provider="ovn" type="ovndb-servers"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="ovn-dbs-bundle-1" CRM_meta_on_node_uuid="ovn-dbs-bundle-1" CRM_meta_op_target_rc="8" CRM_meta_physical_host="controller-1" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_role="Master" CRM_meta_timeout="60000"  inactive_probe_interval="180000" listen_on_master_ip_only="no" manage_northd="yes" master_ip="172.17.1.247" nb_master_port="6641" sb_master_port="6642"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="191" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
+        <rsc_op id="188" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="206" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="203" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="212" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="209" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="191" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1">
+      <rsc_op id="188" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1">
         <primitive id="ovndb_servers" long-id="ovndb_servers:1" class="ocf" provider="ovn" type="ovndb-servers"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_container_attribute_target="host" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="ovndb_servers:0 ovndb_servers:1 ovndb_servers:2" CRM_meta_notify_active_uname="ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_all_hosts="controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2 controller-0 controller-1 controller-2" CRM_meta_notify_all_uname="controller-0 controller-1 controller-2 galera-bundle-0 galera-bundle-1 galera-bundle-2 ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2 rabbitmq-bundle-0 rabbitmq-bundle-1 rabbitmq-bundle-2 redis-bundle-0 redis-bundle-1 redis-bundle-2" CRM_meta_notify_available_uname="controller-0 controller-1 controller-2 ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="ovndb_servers:1" CRM_meta_notify_promote_uname="ovn-dbs-bundle-1" CRM_meta_notify_slave_resource="ovndb_servers:0 ovndb_servers:1 ovndb_servers:2" CRM_meta_notify_slave_uname="ovn-dbs-bundle-0 ovn-dbs-bundle-1 ovn-dbs-bundle-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="ovndb_servers:0" CRM_meta_notify_stop_uname="ovn-dbs-bundle-0" CRM_meta_on_node="ovn-dbs-bundle-1" CRM_meta_on_node_uuid="ovn-dbs-bundle-1" CRM_meta_physical_host="controller-1" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="50000"  inactive_probe_interval="180000" listen_on_master_ip_only="no" manage_northd="yes" master_ip="172.17.1.247" nb_master_port="6641" sb_master_port="6642"/>
       </rsc_op>
@@ -111,7 +111,7 @@
         <rsc_op id="40" operation="cancel" operation_key="ovndb_servers_monitor_30000" internal_operation_key="ovndb_servers:1_monitor_30000" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="207" operation="promote" operation_key="ovn-dbs-bundle-master_promote_0"/>
+        <pseudo_event id="204" operation="promote" operation_key="ovn-dbs-bundle-master_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -133,7 +133,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="211" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="208" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -146,7 +146,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="209" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="206" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -159,7 +159,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="205" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
+        <pseudo_event id="202" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -172,19 +172,19 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="203" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
+        <pseudo_event id="200" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="212" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0">
+      <pseudo_event id="209" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="3" 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="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="211" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
+        <pseudo_event id="208" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="267" operation="notify" operation_key="ovndb_servers_post_notify_promote_0" internal_operation_key="ovndb_servers:1_post_notify_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
@@ -196,28 +196,28 @@
   </synapse>
   <synapse id="14" priority="1000000">
     <action_set>
-      <pseudo_event id="211" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0">
+      <pseudo_event id="208" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="3" 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="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="208" operation="promoted" operation_key="ovn-dbs-bundle-master_promoted_0"/>
+        <pseudo_event id="205" operation="promoted" operation_key="ovn-dbs-bundle-master_promoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="210" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0"/>
+        <pseudo_event id="207" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="210" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0">
+      <pseudo_event id="207" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="3" 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="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="209" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
+        <pseudo_event id="206" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0"/>
       </trigger>
       <trigger>
         <rsc_op id="266" operation="notify" operation_key="ovndb_servers_pre_notify_promote_0" internal_operation_key="ovndb_servers:1_pre_notify_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
@@ -229,61 +229,61 @@
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="209" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0">
+      <pseudo_event id="206" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="3" 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="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="200" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="197" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="206" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="203" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17" priority="1000000">
     <action_set>
-      <pseudo_event id="208" operation="promoted" operation_key="ovn-dbs-bundle-master_promoted_0">
+      <pseudo_event id="205" operation="promoted" operation_key="ovn-dbs-bundle-master_promoted_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="191" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
+        <rsc_op id="188" operation="promote" operation_key="ovndb_servers_promote_0" internal_operation_key="ovndb_servers:1_promote_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="207" operation="promote" operation_key="ovn-dbs-bundle-master_promote_0">
+      <pseudo_event id="204" operation="promote" operation_key="ovn-dbs-bundle-master_promote_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="196" operation="running" operation_key="ovn-dbs-bundle-master_running_0"/>
+        <pseudo_event id="193" operation="running" operation_key="ovn-dbs-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="202" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
+        <pseudo_event id="199" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="210" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0"/>
+        <pseudo_event id="207" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="219" operation="promote" operation_key="ovn-dbs-bundle_promote_0"/>
+        <pseudo_event id="216" operation="promote" operation_key="ovn-dbs-bundle_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19" priority="1000000">
     <action_set>
-      <pseudo_event id="206" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="203" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="205" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
+        <pseudo_event id="202" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="263" operation="notify" operation_key="ovndb_servers_post_notify_stop_0" internal_operation_key="ovndb_servers:1_post_notify_stop_0" on_node="ovn-dbs-bundle-1" on_node_uuid="ovn-dbs-bundle-1" router_node="controller-1"/>
@@ -295,28 +295,28 @@
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="205" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0">
+      <pseudo_event id="202" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="202" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
+        <pseudo_event id="199" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="204" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="201" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="204" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="201" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="203" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
+        <pseudo_event id="200" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="261" operation="notify" operation_key="ovndb_servers_pre_notify_stop_0" internal_operation_key="ovndb_servers:0_pre_notify_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0"/>
@@ -331,7 +331,7 @@
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="203" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0">
+      <pseudo_event id="200" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
@@ -339,131 +339,131 @@
   </synapse>
   <synapse id="23" priority="1000000">
     <action_set>
-      <pseudo_event id="202" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0">
+      <pseudo_event id="199" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="187" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0"/>
+        <rsc_op id="184" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="201" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0"/>
+        <pseudo_event id="198" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="201" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0">
+      <pseudo_event id="198" operation="stop" operation_key="ovn-dbs-bundle-master_stop_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="184" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
+        <pseudo_event id="181" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="204" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="201" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25" priority="1000000">
     <action_set>
-      <pseudo_event id="200" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0">
+      <pseudo_event id="197" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="3" 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="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="199" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="196" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26" priority="1000000">
     <action_set>
-      <pseudo_event id="199" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_running_0">
+      <pseudo_event id="196" operation="notify" operation_key="ovn-dbs-bundle-master_post_notify_running_0">
         <attributes CRM_meta_clone_max="3" 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="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="196" operation="running" operation_key="ovn-dbs-bundle-master_running_0"/>
+        <pseudo_event id="193" operation="running" operation_key="ovn-dbs-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="198" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="195" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="198" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0">
+      <pseudo_event id="195" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" 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="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="197" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_start_0"/>
+        <pseudo_event id="194" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="197" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_start_0">
+      <pseudo_event id="194" operation="notify" operation_key="ovn-dbs-bundle-master_pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" 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="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="206" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="203" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29" priority="1000000">
     <action_set>
-      <pseudo_event id="196" operation="running" operation_key="ovn-dbs-bundle-master_running_0">
+      <pseudo_event id="193" operation="running" operation_key="ovn-dbs-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="195" operation="start" operation_key="ovn-dbs-bundle-master_start_0"/>
+        <pseudo_event id="192" operation="start" operation_key="ovn-dbs-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="195" operation="start" operation_key="ovn-dbs-bundle-master_start_0">
+      <pseudo_event id="192" operation="start" operation_key="ovn-dbs-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="198" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="195" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="202" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
+        <pseudo_event id="199" operation="stopped" operation_key="ovn-dbs-bundle-master_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <rsc_op id="171" operation="stop" operation_key="ovn-dbs-bundle-podman-0_stop_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="168" operation="stop" operation_key="ovn-dbs-bundle-podman-0_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="ovn-dbs-bundle-podman-0" class="ocf" provider="heartbeat" type="podman"/>
         <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="120000" allow_pull="true"  force_kill="false" image="cluster.common.tag/rhosp16-openstack-ovn-northd:pcmklatest" monitor_cmd="/bin/true" mount_points="/var/log/pacemaker/bundles/ovn-dbs-bundle-0" reuse="false" run_cmd="/bin/bash /usr/local/bin/kolla_start" run_opts=" -e PCMK_stderr=1 --net=host -e PCMK_remote_port=3125 -v /var/lib/kolla/config_files/ovn_dbs.json:/var/lib/kolla/config_files/config.json:ro -v /lib/modules:/lib/modules:ro -v /var/lib/openvswitch/ovn:/run/openvswitch:rw -v /var/log/containers/openvswitch:/var/log/openvswitch:rw -v /var/lib/openvswitch/ovn:/etc/openvswitch:rw -v /usr/lib/ocf/resource.d/ovn:/usr/lib/ocf/resource.d/ovn:rw -v /etc/pacemaker/authkey:/etc/pacemaker/authkey -v /var/log/pacemaker/bundles/ovn-dbs-bundle-0:/var/log --log-driver=k8s-file --log-opt path=/var/log/containers/stdouts/ovn-dbs-bundle.log -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="172" operation="stop" operation_key="ovn-dbs-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="169" operation="stop" operation_key="ovn-dbs-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="184" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
+        <pseudo_event id="181" operation="stop" operation_key="ovn-dbs-bundle_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="172" operation="stop" operation_key="ovn-dbs-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1">
+      <rsc_op id="169" operation="stop" operation_key="ovn-dbs-bundle-0_stop_0" on_node="controller-0" on_node_uuid="1">
         <primitive id="ovn-dbs-bundle-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="ovn-dbs-bundle-podman-0" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="120000" addr="controller-0"  port="3125"/>
         <downed>
@@ -473,174 +473,69 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="187" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0"/>
+        <rsc_op id="184" operation="stop" operation_key="ovndb_servers_stop_0" internal_operation_key="ovndb_servers:0_stop_0" on_node="ovn-dbs-bundle-0" on_node_uuid="ovn-dbs-bundle-0" router_node="controller-0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="33">
+  <synapse id="33" priority="1000000">
     <action_set>
-      <rsc_op id="223" operation="stop" operation_key="stonith-fence_ipmilan-5254005e097a_stop_0" on_node="controller-0" on_node_uuid="1">
-        <primitive id="stonith-fence_ipmilan-5254005e097a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6230" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="34">
-    <action_set>
-      <rsc_op id="42" operation="start" operation_key="stonith-fence_ipmilan-5254005e097a_start_0" on_node="controller-0" on_node_uuid="1">
-        <primitive id="stonith-fence_ipmilan-5254005e097a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6230" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="223" operation="stop" operation_key="stonith-fence_ipmilan-5254005e097a_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="35">
-    <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-fence_ipmilan-5254005e097a_monitor_60000" on_node="controller-0" on_node_uuid="1">
-        <primitive id="stonith-fence_ipmilan-5254005e097a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6230" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="42" operation="start" operation_key="stonith-fence_ipmilan-5254005e097a_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="36">
-    <action_set>
-      <rsc_op id="224" operation="stop" operation_key="stonith-fence_ipmilan-525400afe30e_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400afe30e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="37">
-    <action_set>
-      <rsc_op id="44" operation="start" operation_key="stonith-fence_ipmilan-525400afe30e_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400afe30e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="224" operation="stop" operation_key="stonith-fence_ipmilan-525400afe30e_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="38">
-    <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="stonith-fence_ipmilan-525400afe30e_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-525400afe30e" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="44" operation="start" operation_key="stonith-fence_ipmilan-525400afe30e_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="225" operation="stop" operation_key="stonith-fence_ipmilan-525400985679_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400985679" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="40">
-    <action_set>
-      <rsc_op id="43" operation="start" operation_key="stonith-fence_ipmilan-525400985679_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400985679" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="225" operation="stop" operation_key="stonith-fence_ipmilan-525400985679_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="41">
-    <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="stonith-fence_ipmilan-525400985679_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400985679" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="120000"  delay="20" ipaddr="172.16.0.21" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="43" operation="start" operation_key="stonith-fence_ipmilan-525400985679_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="42" priority="1000000">
-    <action_set>
-      <pseudo_event id="220" operation="promoted" operation_key="ovn-dbs-bundle_promoted_0">
+      <pseudo_event id="217" operation="promoted" operation_key="ovn-dbs-bundle_promoted_0">
         <attributes CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="212" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0"/>
+        <pseudo_event id="209" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="43">
+  <synapse id="34">
     <action_set>
-      <pseudo_event id="219" operation="promote" operation_key="ovn-dbs-bundle_promote_0">
+      <pseudo_event id="216" operation="promote" operation_key="ovn-dbs-bundle_promote_0">
         <attributes CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="183" operation="running" operation_key="ovn-dbs-bundle_running_0"/>
+        <pseudo_event id="180" operation="running" operation_key="ovn-dbs-bundle_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="185" operation="stopped" operation_key="ovn-dbs-bundle_stopped_0"/>
+        <pseudo_event id="182" operation="stopped" operation_key="ovn-dbs-bundle_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44" priority="1000000">
+  <synapse id="35" priority="1000000">
     <action_set>
-      <pseudo_event id="185" operation="stopped" operation_key="ovn-dbs-bundle_stopped_0">
+      <pseudo_event id="182" operation="stopped" operation_key="ovn-dbs-bundle_stopped_0">
         <attributes CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="171" operation="stop" operation_key="ovn-dbs-bundle-podman-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
+        <rsc_op id="168" operation="stop" operation_key="ovn-dbs-bundle-podman-0_stop_0" on_node="controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="206" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="203" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="36">
     <action_set>
-      <pseudo_event id="184" operation="stop" operation_key="ovn-dbs-bundle_stop_0">
+      <pseudo_event id="181" operation="stop" operation_key="ovn-dbs-bundle_stop_0">
         <attributes CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="46" priority="1000000">
+  <synapse id="37" priority="1000000">
     <action_set>
-      <pseudo_event id="183" operation="running" operation_key="ovn-dbs-bundle_running_0">
+      <pseudo_event id="180" operation="running" operation_key="ovn-dbs-bundle_running_0">
         <attributes CRM_meta_timeout="120000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="200" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="197" operation="notified" operation_key="ovn-dbs-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/cts/scheduler/no-promote-on-unrunnable-guest.scores b/cts/scheduler/no-promote-on-unrunnable-guest.scores
index f368ad4..3e6776f 100644
--- a/cts/scheduler/no-promote-on-unrunnable-guest.scores
+++ b/cts/scheduler/no-promote-on-unrunnable-guest.scores
@@ -1,4 +1,10 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-5254005e097a_monitor_60000 on controller-0 changed: 0:0;218:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-5254005e097a_start_0 on controller-0 changed: 0:0;217:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400985679_monitor_60000 on controller-1 changed: 0:0;224:64:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400985679_start_0 on controller-1 changed: 0:0;223:64:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400afe30e_monitor_60000 on controller-2 changed: 0:0;220:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400afe30e_start_0 on controller-2 changed: 0:0;219:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
 Using the original execution date of: 2020-05-14 10:49:31Z
 galera:0 promotion score on galera-bundle-0: 100
 galera:1 promotion score on galera-bundle-1: 100
diff --git a/cts/scheduler/no-promote-on-unrunnable-guest.summary b/cts/scheduler/no-promote-on-unrunnable-guest.summary
index fd6b926..fdc2668 100644
--- a/cts/scheduler/no-promote-on-unrunnable-guest.summary
+++ b/cts/scheduler/no-promote-on-unrunnable-guest.summary
@@ -26,27 +26,21 @@ GuestOnline: [ galera-bundle-0:galera-bundle-podman-0 galera-bundle-1:galera-bun
  Container bundle: openstack-cinder-volume [cluster.common.tag/rhosp16-openstack-cinder-volume:pcmklatest]
    openstack-cinder-volume-podman-0	(ocf::heartbeat:podman):	 Started controller-0
 
+Only 'private' parameters to stonith-fence_ipmilan-5254005e097a_start_0 on controller-0 changed: 0:0;217:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-5254005e097a_monitor_60000 on controller-0 changed: 0:0;218:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400985679_start_0 on controller-1 changed: 0:0;223:64:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400985679_monitor_60000 on controller-1 changed: 0:0;224:64:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400afe30e_start_0 on controller-2 changed: 0:0;219:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
+Only 'private' parameters to stonith-fence_ipmilan-525400afe30e_monitor_60000 on controller-2 changed: 0:0;220:60:0:515fab44-df8e-4e73-a22c-ed4886e03330
 Transition Summary:
  * Stop       ovn-dbs-bundle-podman-0                (                     controller-0 )   due to node availability
  * Stop       ovn-dbs-bundle-0                       (                     controller-0 )   due to unrunnable ovn-dbs-bundle-podman-0 start
  * Stop       ovndb_servers:0                        (           Slave ovn-dbs-bundle-0 )   due to unrunnable ovn-dbs-bundle-podman-0 start
  * Promote    ovndb_servers:1                        ( Slave -> Master ovn-dbs-bundle-1 )  
- * Restart    stonith-fence_ipmilan-5254005e097a     (                     controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400afe30e     (                     controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400985679     (                     controller-1 )   due to resource definition change
 
 Executing cluster transition:
  * Resource action: ovndb_servers   cancel=30000 on ovn-dbs-bundle-1
  * Pseudo action:   ovn-dbs-bundle-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-5254005e097a stop on controller-0
- * Resource action: stonith-fence_ipmilan-5254005e097a start on controller-0
- * Resource action: stonith-fence_ipmilan-5254005e097a monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400afe30e stop on controller-2
- * Resource action: stonith-fence_ipmilan-525400afe30e start on controller-2
- * Resource action: stonith-fence_ipmilan-525400afe30e monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-525400985679 stop on controller-1
- * Resource action: stonith-fence_ipmilan-525400985679 start on controller-1
- * Resource action: stonith-fence_ipmilan-525400985679 monitor=60000 on controller-1
  * Pseudo action:   ovn-dbs-bundle_stop_0
  * Resource action: ovndb_servers   notify on ovn-dbs-bundle-0
  * Resource action: ovndb_servers   notify on ovn-dbs-bundle-1
diff --git a/cts/scheduler/notifs-for-unrunnable.dot b/cts/scheduler/notifs-for-unrunnable.dot
index f17e9b4..aa4039e 100644
--- a/cts/scheduler/notifs-for-unrunnable.dot
+++ b/cts/scheduler/notifs-for-unrunnable.dot
@@ -74,19 +74,4 @@
 "redis:0_start_0 redis-bundle-0" -> "redis:0_monitor_45000 redis-bundle-0" [ style = dashed]
 "redis:0_start_0 redis-bundle-0" -> "redis:0_monitor_60000 redis-bundle-0" [ style = dashed]
 "redis:0_start_0 redis-bundle-0" [ style=dashed color="red" fontcolor="black"]
-"stonith-fence_ipmilan-5254002ff217_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254002ff217_start_0 controller-2" -> "stonith-fence_ipmilan-5254002ff217_monitor_60000 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254002ff217_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254002ff217_stop_0 controller-2" -> "stonith-fence_ipmilan-5254002ff217_start_0 controller-2" [ style = bold]
-"stonith-fence_ipmilan-5254002ff217_stop_0 controller-2" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254008f971a_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254008f971a_start_0 controller-1" -> "stonith-fence_ipmilan-5254008f971a_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254008f971a_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-5254008f971a_stop_0 controller-1" -> "stonith-fence_ipmilan-5254008f971a_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-5254008f971a_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400fec0c8_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400fec0c8_start_0 controller-1" -> "stonith-fence_ipmilan-525400fec0c8_monitor_60000 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400fec0c8_start_0 controller-1" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400fec0c8_stop_0 controller-1" -> "stonith-fence_ipmilan-525400fec0c8_start_0 controller-1" [ style = bold]
-"stonith-fence_ipmilan-525400fec0c8_stop_0 controller-1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/notifs-for-unrunnable.exp b/cts/scheduler/notifs-for-unrunnable.exp
index 82067ae..44bb4c3 100644
--- a/cts/scheduler/notifs-for-unrunnable.exp
+++ b/cts/scheduler/notifs-for-unrunnable.exp
@@ -1,46 +1,46 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0" priority="1000000">
     <action_set>
-      <pseudo_event id="60" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_running_0">
+      <pseudo_event id="57" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="59" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
+        <pseudo_event id="56" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1" priority="1000000">
     <action_set>
-      <pseudo_event id="59" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0">
+      <pseudo_event id="56" operation="notify" operation_key="rabbitmq-bundle-clone_post_notify_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="56" operation="running" operation_key="rabbitmq-bundle-clone_running_0"/>
+        <pseudo_event id="53" operation="running" operation_key="rabbitmq-bundle-clone_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="58" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="55" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="58" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0">
+      <pseudo_event id="55" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="57" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0"/>
+        <pseudo_event id="54" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="57" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0">
+      <pseudo_event id="54" operation="notify" operation_key="rabbitmq-bundle-clone_pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -48,97 +48,97 @@
   </synapse>
   <synapse id="4" priority="1000000">
     <action_set>
-      <pseudo_event id="56" operation="running" operation_key="rabbitmq-bundle-clone_running_0">
+      <pseudo_event id="53" operation="running" operation_key="rabbitmq-bundle-clone_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="55" operation="start" operation_key="rabbitmq-bundle-clone_start_0"/>
+        <pseudo_event id="52" operation="start" operation_key="rabbitmq-bundle-clone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="55" operation="start" operation_key="rabbitmq-bundle-clone_start_0">
+      <pseudo_event id="52" operation="start" operation_key="rabbitmq-bundle-clone_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="45" operation="start" operation_key="rabbitmq-bundle_start_0"/>
+        <pseudo_event id="42" operation="start" operation_key="rabbitmq-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="58" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="55" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="93" operation="running" operation_key="galera-bundle-master_running_0">
+      <pseudo_event id="90" operation="running" operation_key="galera-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="92" operation="start" operation_key="galera-bundle-master_start_0"/>
+        <pseudo_event id="89" operation="start" operation_key="galera-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="92" operation="start" operation_key="galera-bundle-master_start_0">
+      <pseudo_event id="89" operation="start" operation_key="galera-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="start" operation_key="galera-bundle_start_0"/>
+        <pseudo_event id="74" operation="start" operation_key="galera-bundle_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
-      <pseudo_event id="132" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
+      <pseudo_event id="129" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0">
         <attributes CRM_meta_clone_max="3" 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="running" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="131" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
+        <pseudo_event id="128" operation="notify" operation_key="redis-bundle-master_post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9" priority="1000000">
     <action_set>
-      <pseudo_event id="131" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
+      <pseudo_event id="128" operation="notify" operation_key="redis-bundle-master_post_notify_running_0">
         <attributes CRM_meta_clone_max="3" 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="running" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="128" operation="running" operation_key="redis-bundle-master_running_0"/>
+        <pseudo_event id="125" operation="running" operation_key="redis-bundle-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="130" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="127" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="130" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
+      <pseudo_event id="127" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" 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="start" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="129" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
+        <pseudo_event id="126" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="129" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
+      <pseudo_event id="126" operation="notify" operation_key="redis-bundle-master_pre_notify_start_0">
         <attributes CRM_meta_clone_max="3" 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="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -146,191 +146,86 @@
   </synapse>
   <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="128" operation="running" operation_key="redis-bundle-master_running_0">
+      <pseudo_event id="125" operation="running" operation_key="redis-bundle-master_running_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="127" operation="start" operation_key="redis-bundle-master_start_0"/>
+        <pseudo_event id="124" operation="start" operation_key="redis-bundle-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <pseudo_event id="127" operation="start" operation_key="redis-bundle-master_start_0">
+      <pseudo_event id="124" operation="start" operation_key="redis-bundle-master_start_0">
         <attributes CRM_meta_clone_max="3" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="114" operation="start" operation_key="redis-bundle_start_0"/>
+        <pseudo_event id="111" operation="start" operation_key="redis-bundle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="130" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
+        <pseudo_event id="127" operation="notified" operation_key="redis-bundle-master_confirmed-pre_notify_start_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14">
+  <synapse id="14" priority="1000000">
     <action_set>
-      <rsc_op id="177" operation="stop" operation_key="stonith-fence_ipmilan-525400fec0c8_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400fec0c8" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="15">
-    <action_set>
-      <rsc_op id="32" operation="start" operation_key="stonith-fence_ipmilan-525400fec0c8_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400fec0c8" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="177" operation="stop" operation_key="stonith-fence_ipmilan-525400fec0c8_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="stonith-fence_ipmilan-525400fec0c8_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-525400fec0c8" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6231" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="32" operation="start" operation_key="stonith-fence_ipmilan-525400fec0c8_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="17">
-    <action_set>
-      <rsc_op id="178" operation="stop" operation_key="stonith-fence_ipmilan-5254002ff217_stop_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254002ff217" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="18">
-    <action_set>
-      <rsc_op id="34" operation="start" operation_key="stonith-fence_ipmilan-5254002ff217_start_0" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254002ff217" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="178" operation="stop" operation_key="stonith-fence_ipmilan-5254002ff217_stop_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="19">
-    <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="stonith-fence_ipmilan-5254002ff217_monitor_60000" on_node="controller-2" on_node_uuid="3">
-        <primitive id="stonith-fence_ipmilan-5254002ff217" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6232" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="34" operation="start" operation_key="stonith-fence_ipmilan-5254002ff217_start_0" on_node="controller-2" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="20">
-    <action_set>
-      <rsc_op id="179" operation="stop" operation_key="stonith-fence_ipmilan-5254008f971a_stop_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254008f971a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="21">
-    <action_set>
-      <rsc_op id="33" operation="start" operation_key="stonith-fence_ipmilan-5254008f971a_start_0" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254008f971a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="179" operation="stop" operation_key="stonith-fence_ipmilan-5254008f971a_stop_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="22">
-    <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="stonith-fence_ipmilan-5254008f971a_monitor_60000" on_node="controller-1" on_node_uuid="2">
-        <primitive id="stonith-fence_ipmilan-5254008f971a" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-1" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  ipaddr="172.16.0.1" ipport="6235" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-0" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="33" operation="start" operation_key="stonith-fence_ipmilan-5254008f971a_start_0" on_node="controller-1" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="23" priority="1000000">
-    <action_set>
-      <pseudo_event id="115" operation="running" operation_key="redis-bundle_running_0">
+      <pseudo_event id="112" operation="running" operation_key="redis-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="132" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
+        <pseudo_event id="129" operation="notified" operation_key="redis-bundle-master_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="24">
+  <synapse id="15">
     <action_set>
-      <pseudo_event id="114" operation="start" operation_key="redis-bundle_start_0">
+      <pseudo_event id="111" operation="start" operation_key="redis-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="25" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="78" operation="running" operation_key="galera-bundle_running_0">
+      <pseudo_event id="75" operation="running" operation_key="galera-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="93" operation="running" operation_key="galera-bundle-master_running_0"/>
+        <pseudo_event id="90" operation="running" operation_key="galera-bundle-master_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="26">
+  <synapse id="17">
     <action_set>
-      <pseudo_event id="77" operation="start" operation_key="galera-bundle_start_0">
+      <pseudo_event id="74" operation="start" operation_key="galera-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="27" priority="1000000">
+  <synapse id="18" priority="1000000">
     <action_set>
-      <pseudo_event id="46" operation="running" operation_key="rabbitmq-bundle_running_0">
+      <pseudo_event id="43" operation="running" operation_key="rabbitmq-bundle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="60" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_running_0"/>
+        <pseudo_event id="57" operation="notified" operation_key="rabbitmq-bundle-clone_confirmed-post_notify_running_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="28">
+  <synapse id="19">
     <action_set>
-      <pseudo_event id="45" operation="start" operation_key="rabbitmq-bundle_start_0">
+      <pseudo_event id="42" operation="start" operation_key="rabbitmq-bundle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
diff --git a/cts/scheduler/notifs-for-unrunnable.scores b/cts/scheduler/notifs-for-unrunnable.scores
index cd9df1c..8434da8 100644
--- a/cts/scheduler/notifs-for-unrunnable.scores
+++ b/cts/scheduler/notifs-for-unrunnable.scores
@@ -1,4 +1,10 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-5254002ff217_monitor_60000 on controller-2 changed: 0:0;181:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254002ff217_start_0 on controller-2 changed: 0:0;180:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254008f971a_monitor_60000 on controller-1 changed: 0:0;183:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254008f971a_start_0 on controller-1 changed: 0:0;182:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-525400fec0c8_monitor_60000 on controller-1 changed: 0:0;179:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-525400fec0c8_start_0 on controller-1 changed: 0:0;178:2:0:8b283351-71e8-4848-b470-8664f73af1e9
 Using the original execution date of: 2018-02-13 23:40:47Z
 galera:0 promotion score on galera-bundle-0: -1
 galera:1 promotion score on galera-bundle-1: 100
diff --git a/cts/scheduler/notifs-for-unrunnable.summary b/cts/scheduler/notifs-for-unrunnable.summary
index d8d00fd..3f1680c 100644
--- a/cts/scheduler/notifs-for-unrunnable.summary
+++ b/cts/scheduler/notifs-for-unrunnable.summary
@@ -32,6 +32,12 @@ GuestOnline: [ galera-bundle-1:galera-bundle-docker-1 galera-bundle-2:galera-bun
  stonith-fence_ipmilan-5254002ff217	(stonith:fence_ipmilan):	 Started controller-2
  stonith-fence_ipmilan-5254008f971a	(stonith:fence_ipmilan):	 Started controller-1
 
+Only 'private' parameters to stonith-fence_ipmilan-525400fec0c8_start_0 on controller-1 changed: 0:0;178:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-525400fec0c8_monitor_60000 on controller-1 changed: 0:0;179:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254008f971a_start_0 on controller-1 changed: 0:0;182:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254008f971a_monitor_60000 on controller-1 changed: 0:0;183:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254002ff217_start_0 on controller-2 changed: 0:0;180:2:0:8b283351-71e8-4848-b470-8664f73af1e9
+Only 'private' parameters to stonith-fence_ipmilan-5254002ff217_monitor_60000 on controller-2 changed: 0:0;181:2:0:8b283351-71e8-4848-b470-8664f73af1e9
 Transition Summary:
  * Start      rabbitmq-bundle-0                      (      controller-1 )   due to unrunnable rabbitmq-bundle-docker-0 start (blocked)
  * Start      rabbitmq:0                             ( rabbitmq-bundle-0 )   due to unrunnable rabbitmq-bundle-docker-0 start (blocked)
@@ -39,22 +45,10 @@ Transition Summary:
  * Start      galera:0                               (   galera-bundle-0 )   due to unrunnable galera-bundle-docker-0 start (blocked)
  * Start      redis-bundle-0                         (      controller-1 )   due to unrunnable redis-bundle-docker-0 start (blocked)
  * Start      redis:0                                (    redis-bundle-0 )   due to unrunnable redis-bundle-docker-0 start (blocked)
- * Restart    stonith-fence_ipmilan-525400fec0c8     (      controller-1 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-5254002ff217     (      controller-2 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-5254008f971a     (      controller-1 )   due to resource definition change
 
 Executing cluster transition:
  * Pseudo action:   rabbitmq-bundle-clone_pre_notify_start_0
  * Pseudo action:   redis-bundle-master_pre_notify_start_0
- * Resource action: stonith-fence_ipmilan-525400fec0c8 stop on controller-1
- * Resource action: stonith-fence_ipmilan-525400fec0c8 start on controller-1
- * Resource action: stonith-fence_ipmilan-525400fec0c8 monitor=60000 on controller-1
- * Resource action: stonith-fence_ipmilan-5254002ff217 stop on controller-2
- * Resource action: stonith-fence_ipmilan-5254002ff217 start on controller-2
- * Resource action: stonith-fence_ipmilan-5254002ff217 monitor=60000 on controller-2
- * Resource action: stonith-fence_ipmilan-5254008f971a stop on controller-1
- * Resource action: stonith-fence_ipmilan-5254008f971a start on controller-1
- * Resource action: stonith-fence_ipmilan-5254008f971a monitor=60000 on controller-1
  * Pseudo action:   redis-bundle_start_0
  * Pseudo action:   galera-bundle_start_0
  * Pseudo action:   rabbitmq-bundle_start_0
diff --git a/cts/scheduler/on-fail-ignore.dot b/cts/scheduler/on-fail-ignore.dot
index 66d22cc..d8f1c9f 100644
--- a/cts/scheduler/on-fail-ignore.dot
+++ b/cts/scheduler/on-fail-ignore.dot
@@ -1,12 +1,2 @@
  digraph "g" {
-"fence_db1_monitor_60000 407892-db2" [ style=bold color="green" fontcolor="black"]
-"fence_db1_start_0 407892-db2" -> "fence_db1_monitor_60000 407892-db2" [ style = bold]
-"fence_db1_start_0 407892-db2" [ style=bold color="green" fontcolor="black"]
-"fence_db1_stop_0 407892-db2" -> "fence_db1_start_0 407892-db2" [ style = bold]
-"fence_db1_stop_0 407892-db2" [ style=bold color="green" fontcolor="black"]
-"fence_db2_monitor_60000 407888-db1" [ style=bold color="green" fontcolor="black"]
-"fence_db2_start_0 407888-db1" -> "fence_db2_monitor_60000 407888-db1" [ style = bold]
-"fence_db2_start_0 407888-db1" [ style=bold color="green" fontcolor="black"]
-"fence_db2_stop_0 407888-db1" -> "fence_db2_start_0 407888-db1" [ style = bold]
-"fence_db2_stop_0 407888-db1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/on-fail-ignore.exp b/cts/scheduler/on-fail-ignore.exp
index fc3fb5b..56e315f 100644
--- a/cts/scheduler/on-fail-ignore.exp
+++ b/cts/scheduler/on-fail-ignore.exp
@@ -1,72 +1 @@
-<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
-  <synapse id="0">
-    <action_set>
-      <rsc_op id="6" operation="stop" operation_key="fence_db1_stop_0" on_node="407892-db2" on_node_uuid="2">
-        <primitive id="fence_db1" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="407892-db2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  delay="4" ipaddr="192.168.103.3" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407888-db1" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="1">
-    <action_set>
-      <rsc_op id="5" operation="start" operation_key="fence_db1_start_0" on_node="407892-db2" on_node_uuid="2">
-        <primitive id="fence_db1" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="407892-db2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  delay="4" ipaddr="192.168.103.3" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407888-db1" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="6" operation="stop" operation_key="fence_db1_stop_0" on_node="407892-db2" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="2">
-    <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="fence_db1_monitor_60000" on_node="407892-db2" on_node_uuid="2">
-        <primitive id="fence_db1" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="407892-db2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000"  delay="4" ipaddr="192.168.103.3" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407888-db1" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="5" operation="start" operation_key="fence_db1_start_0" on_node="407892-db2" on_node_uuid="2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="3">
-    <action_set>
-      <rsc_op id="7" operation="stop" operation_key="fence_db2_stop_0" on_node="407888-db1" on_node_uuid="1">
-        <primitive id="fence_db2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="407888-db1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  ipaddr="192.168.103.4" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407892-db2" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="4">
-    <action_set>
-      <rsc_op id="4" operation="start" operation_key="fence_db2_start_0" on_node="407888-db1" on_node_uuid="1">
-        <primitive id="fence_db2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_on_node="407888-db1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  ipaddr="192.168.103.4" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407892-db2" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="7" operation="stop" operation_key="fence_db2_stop_0" on_node="407888-db1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="5">
-    <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="fence_db2_monitor_60000" on_node="407888-db1" on_node_uuid="1">
-        <primitive id="fence_db2" class="stonith" type="fence_ipmilan"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="407888-db1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  ipaddr="192.168.103.4" lanplus="1" login="root" method="onoff" passwd="****" pcmk_host_check="static-list" pcmk_host_list="407892-db2" power_wait="4"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="4" operation="start" operation_key="fence_db2_start_0" on_node="407888-db1" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-</transition_graph>
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0"/>
diff --git a/cts/scheduler/on-fail-ignore.scores b/cts/scheduler/on-fail-ignore.scores
index 85040ba..64c9896 100644
--- a/cts/scheduler/on-fail-ignore.scores
+++ b/cts/scheduler/on-fail-ignore.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to fence_db1_monitor_60000 on 407892-db2 changed: 0:0;5:3:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db1_start_0 on 407892-db2 changed: 0:0;4:3:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db2_monitor_60000 on 407888-db1 changed: 0:0;8:4:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db2_start_0 on 407888-db1 changed: 0:0;7:4:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
 Using the original execution date of: 2017-10-26 14:23:50Z
 pcmk__native_allocate: fence_db1 allocation score on 407888-db1: 0
 pcmk__native_allocate: fence_db1 allocation score on 407892-db2: 100
diff --git a/cts/scheduler/on-fail-ignore.summary b/cts/scheduler/on-fail-ignore.summary
index fb4b0f3..7605f37 100644
--- a/cts/scheduler/on-fail-ignore.summary
+++ b/cts/scheduler/on-fail-ignore.summary
@@ -7,17 +7,13 @@ Online: [ 407888-db1 407892-db2 ]
  fence_db2	(stonith:fence_ipmilan):	 Started 407888-db1
  nfs_snet_ip	(ocf::heartbeat:IPaddr2):	 Started 407888-db1 (failure ignored)
 
+Only 'private' parameters to fence_db2_start_0 on 407888-db1 changed: 0:0;7:4:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db2_monitor_60000 on 407888-db1 changed: 0:0;8:4:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db1_start_0 on 407892-db2 changed: 0:0;4:3:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
+Only 'private' parameters to fence_db1_monitor_60000 on 407892-db2 changed: 0:0;5:3:0:dcc10f17-10a1-4e5d-89af-ef7ff033520d
 Transition Summary:
- * Restart    fence_db1     ( 407892-db2 )   due to resource definition change
- * Restart    fence_db2     ( 407888-db1 )   due to resource definition change
 
 Executing cluster transition:
- * Resource action: fence_db1       stop on 407892-db2
- * Resource action: fence_db1       start on 407892-db2
- * Resource action: fence_db1       monitor=60000 on 407892-db2
- * Resource action: fence_db2       stop on 407888-db1
- * Resource action: fence_db2       start on 407888-db1
- * Resource action: fence_db2       monitor=60000 on 407888-db1
 Using the original execution date of: 2017-10-26 14:23:50Z
 
 Revised cluster status:
diff --git a/cts/scheduler/remote-recover-all.dot b/cts/scheduler/remote-recover-all.dot
index 819e5eb..d513ce4 100644
--- a/cts/scheduler/remote-recover-all.dot
+++ b/cts/scheduler/remote-recover-all.dot
@@ -117,8 +117,6 @@
 "stonith 'reboot' galera-2" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
 "stonith 'reboot' galera-2" -> "stonith 'reboot' messaging-1" [ style = bold]
 "stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
-"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
 "stonith 'reboot' galera-2" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' messaging-1" -> "galera-0_start_0 controller-2" [ style = bold]
 "stonith 'reboot' messaging-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
@@ -128,22 +126,10 @@
 "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold]
 "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold]
 "stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
 "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/remote-recover-all.exp b/cts/scheduler/remote-recover-all.exp
index 0cb51f6..7edc970 100644
--- a/cts/scheduler/remote-recover-all.exp
+++ b/cts/scheduler/remote-recover-all.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0">
+      <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -9,27 +9,27 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="31" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="29" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
+        <pseudo_event id="27" operation="stop" operation_key="galera-0_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -41,7 +41,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0">
+      <pseudo_event id="27" operation="stop" operation_key="galera-0_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -49,7 +49,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="galera-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -113,13 +113,13 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="39" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
+      <pseudo_event id="37" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
         <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_notify_stop_resource="rabbitmq:2" CRM_meta_notify_stop_uname="messaging-1" CRM_meta_timeout="200000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="40" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="125" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -128,22 +128,22 @@
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="43" operation="stopped" operation_key="rabbitmq-clone_stopped_0">
+      <pseudo_event id="41" 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>
-        <pseudo_event id="39" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
+        <pseudo_event id="37" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="40" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0">
+      <pseudo_event id="40" 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>
@@ -155,16 +155,16 @@
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="49" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0">
+      <pseudo_event id="47" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0">
         <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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="48" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0"/>
+        <pseudo_event id="46" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="56" operation="stop" operation_key="galera-master_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="galera-master_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -173,13 +173,13 @@
   </synapse>
   <synapse id="13">
     <action_set>
-      <pseudo_event id="48" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0">
+      <pseudo_event id="46" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0">
         <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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="120000" additional_parameters="--open-files-limit=16384"  enable_creation="true" wsrep_cluster_address="gcomm://galera-0,galera-1,galera-2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="60" operation="demote" operation_key="galera-master_demote_0"/>
+        <pseudo_event id="58" operation="demote" operation_key="galera-master_demote_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -195,28 +195,28 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15" priority="1000000">
     <action_set>
-      <pseudo_event id="61" operation="demoted" operation_key="galera-master_demoted_0">
+      <pseudo_event id="59" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="48" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0"/>
+        <pseudo_event id="46" operation="demote" operation_key="galera_demote_0" internal_operation_key="galera:1_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="60" operation="demote" operation_key="galera-master_demote_0"/>
+        <pseudo_event id="58" operation="demote" operation_key="galera-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="60" operation="demote" operation_key="galera-master_demote_0">
+      <pseudo_event id="58" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -224,28 +224,28 @@
   </synapse>
   <synapse id="17" priority="1000000">
     <action_set>
-      <pseudo_event id="57" operation="stopped" operation_key="galera-master_stopped_0">
+      <pseudo_event id="55" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="49" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0"/>
+        <pseudo_event id="47" operation="stop" operation_key="galera_stop_0" internal_operation_key="galera:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="56" operation="stop" operation_key="galera-master_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="galera-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="56" operation="stop" operation_key="galera-master_stop_0">
+      <pseudo_event id="54" 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_promoted_max="3" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="61" operation="demoted" operation_key="galera-master_demoted_0"/>
+        <pseudo_event id="59" operation="demoted" operation_key="galera-master_demoted_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -284,7 +284,7 @@
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="62" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
+      <pseudo_event id="60" 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-0 controller-1 controller-2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
@@ -293,7 +293,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="75" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="73" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -306,7 +306,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -319,7 +319,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="79" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="126" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -335,7 +335,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -348,7 +348,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="79" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="126" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -357,13 +357,13 @@
   </synapse>
   <synapse id="26" priority="1000000">
     <action_set>
-      <pseudo_event id="80" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="78" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="79" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="128" 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"/>
@@ -375,28 +375,28 @@
   </synapse>
   <synapse id="27" priority="1000000">
     <action_set>
-      <pseudo_event id="79" operation="notify" operation_key="redis-master_post_notify_stopped_0">
+      <pseudo_event id="77" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="76" operation="stopped" operation_key="redis-master_stopped_0"/>
+        <pseudo_event id="74" operation="stopped" operation_key="redis-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="78" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="76" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="78" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="76" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="191" 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"/>
@@ -408,7 +408,7 @@
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="77" operation="notify" operation_key="redis-master_pre_notify_stop_0">
+      <pseudo_event id="75" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -416,22 +416,22 @@
   </synapse>
   <synapse id="30" priority="1000000">
     <action_set>
-      <pseudo_event id="76" operation="stopped" operation_key="redis-master_stopped_0">
+      <pseudo_event id="74" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="62" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="75" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="73" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="75" operation="stop" operation_key="redis-master_stop_0">
+      <pseudo_event id="73" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -440,26 +440,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="78" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="76" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="99" operation="monitor" operation_key="ip-172.17.1.14_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="97" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="98" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="96" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="98" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="96" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
@@ -469,7 +469,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="97" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
+        <pseudo_event id="95" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -481,7 +481,7 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <pseudo_event id="97" operation="stop" operation_key="ip-172.17.1.14_stop_0">
+      <pseudo_event id="95" 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"/>
       </pseudo_event>
     </action_set>
@@ -490,26 +490,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35">
     <action_set>
-      <rsc_op id="102" operation="monitor" operation_key="ip-172.17.1.17_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="100" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="101" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="99" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36">
     <action_set>
-      <rsc_op id="101" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="99" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
@@ -519,7 +519,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
+        <pseudo_event id="98" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -531,7 +531,7 @@
   </synapse>
   <synapse id="37">
     <action_set>
-      <pseudo_event id="100" operation="stop" operation_key="ip-172.17.1.17_stop_0">
+      <pseudo_event id="98" 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"/>
       </pseudo_event>
     </action_set>
@@ -540,26 +540,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="38">
     <action_set>
-      <rsc_op id="107" operation="monitor" operation_key="ip-172.17.4.11_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="105" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="106" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="104" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="39">
     <action_set>
-      <rsc_op id="106" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="104" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
@@ -569,7 +569,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="105" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
+        <pseudo_event id="103" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
@@ -581,7 +581,7 @@
   </synapse>
   <synapse id="40">
     <action_set>
-      <pseudo_event id="105" operation="stop" operation_key="ip-172.17.4.11_stop_0">
+      <pseudo_event id="103" 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"/>
       </pseudo_event>
     </action_set>
@@ -590,13 +590,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="116" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="41">
     <action_set>
-      <pseudo_event id="108" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
+      <pseudo_event id="106" 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" />
       </pseudo_event>
     </action_set>
@@ -605,28 +605,28 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="115" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="113" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="42" priority="1000000">
     <action_set>
-      <pseudo_event id="116" operation="stopped" operation_key="haproxy-clone_stopped_0">
+      <pseudo_event id="114" 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" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="108" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
+        <pseudo_event id="106" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="115" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="113" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="43">
     <action_set>
-      <pseudo_event id="115" operation="stop" operation_key="haproxy-clone_stop_0">
+      <pseudo_event id="113" 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" />
       </pseudo_event>
     </action_set>
@@ -638,88 +638,6 @@
   </synapse>
   <synapse id="44">
     <action_set>
-      <rsc_op id="119" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="45">
-    <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="119" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
-      </trigger>
-      <trigger>
-        <crm_event id="125" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="46">
-    <action_set>
-      <rsc_op id="7" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="47">
-    <action_set>
-      <rsc_op id="120" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="48">
-    <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="120" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
-      </trigger>
-      <trigger>
-        <crm_event id="125" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="49">
-    <action_set>
-      <rsc_op id="12" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="23" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="50">
-    <action_set>
       <rsc_op id="123" 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"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" 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"/>
@@ -731,7 +649,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="51">
+  <synapse id="45">
     <action_set>
       <rsc_op id="122" 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"/>
@@ -750,7 +668,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="52">
+  <synapse id="46">
     <action_set>
       <pseudo_event id="121" 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"/>
@@ -758,7 +676,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="53">
+  <synapse id="47">
     <action_set>
       <crm_event id="125" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1">
         <attributes CRM_meta_last_failure_rabbitmq="1493336946" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_rabbitmq_role="true" CRM_meta_rmq_node_attr_last_known_rabbitmq="rabbit@messaging-1" CRM_meta_rmq_node_attr_rabbitmq="rabbit@messaging-1" CRM_meta_stonith_action="reboot" />
@@ -773,7 +691,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="54">
+  <synapse id="48">
     <action_set>
       <crm_event id="124" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2">
         <attributes CRM_meta_galera_role="true" CRM_meta_last_failure_galera="1493172798" CRM_meta_master_galera="100" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_stonith_action="reboot" />
@@ -788,7 +706,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="55">
+  <synapse id="49">
     <action_set>
       <crm_event id="1" 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" />
diff --git a/cts/scheduler/remote-recover-all.scores b/cts/scheduler/remote-recover-all.scores
index e411dfd..82f53ed 100644
--- a/cts/scheduler/remote-recover-all.scores
+++ b/cts/scheduler/remote-recover-all.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Using the original execution date of: 2017-05-03 13:33:24Z
 galera:0 promotion score on galera-1: 100
 galera:1 promotion score on none: 0
diff --git a/cts/scheduler/remote-recover-all.summary b/cts/scheduler/remote-recover-all.summary
index 6b64e42..988114f 100644
--- a/cts/scheduler/remote-recover-all.summary
+++ b/cts/scheduler/remote-recover-all.summary
@@ -37,6 +37,10 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-525400b4f6bd	(stonith:fence_ipmilan):	 Started controller-0
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	 Started controller-1 (UNCLEAN)
 
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Transition Summary:
  * Fence (reboot) messaging-1 'resources are active and the connection is unrecoverable'
  * Fence (reboot) galera-2 'resources are active and the connection is unrecoverable'
@@ -51,8 +55,6 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop       haproxy:0                              (                 controller-1 )   due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
@@ -61,8 +63,6 @@ Executing cluster transition:
  * Pseudo action:   galera-2_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-525400b4f6bd stop on controller-0
  * Pseudo action:   stonith-fence_ipmilan-5254005bdbb5_stop_0
  * Fencing controller-1 (reboot)
  * Pseudo action:   redis_post_notify_stop_0
@@ -90,10 +90,6 @@ Executing cluster transition:
  * 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: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
  * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
  * Resource action: galera-0        monitor=20000 on controller-2
  * Resource action: rabbitmq        notify on messaging-2
diff --git a/cts/scheduler/remote-recover-connection.dot b/cts/scheduler/remote-recover-connection.dot
index 33c4fd0..86192f3 100644
--- a/cts/scheduler/remote-recover-connection.dot
+++ b/cts/scheduler/remote-recover-connection.dot
@@ -95,14 +95,4 @@
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/remote-recover-connection.exp b/cts/scheduler/remote-recover-connection.exp
index d1d33c8..cfcba98 100644
--- a/cts/scheduler/remote-recover-connection.exp
+++ b/cts/scheduler/remote-recover-connection.exp
@@ -1,33 +1,33 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="28" operation="monitor" operation_key="messaging-1_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="26" operation="monitor" operation_key="messaging-1_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="messaging-1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="messaging-1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0"/>
+        <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0">
+      <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -35,33 +35,33 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="33" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="31" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="galera-0_stop_0"/>
+        <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="31" operation="stop" operation_key="galera-0_stop_0">
+      <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -69,33 +69,33 @@
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="38" operation="monitor" operation_key="galera-2_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="36" operation="monitor" operation_key="galera-2_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="galera-2_stop_0"/>
+        <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="36" operation="stop" operation_key="galera-2_stop_0">
+      <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -110,7 +110,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -123,7 +123,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -136,7 +136,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -172,7 +172,7 @@
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
+      <pseudo_event id="67" 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-0 controller-1 controller-2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
@@ -181,7 +181,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -194,7 +194,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -207,7 +207,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="131" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -223,7 +223,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -236,7 +236,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="131" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -245,13 +245,13 @@
   </synapse>
   <synapse id="19" priority="1000000">
     <action_set>
-      <pseudo_event id="87" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="85" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="133" 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"/>
@@ -263,28 +263,28 @@
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0">
+      <pseudo_event id="84" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="83" operation="stopped" operation_key="redis-master_stopped_0"/>
+        <pseudo_event id="81" operation="stopped" operation_key="redis-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="83" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="83" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="187" 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"/>
@@ -296,7 +296,7 @@
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0">
+      <pseudo_event id="82" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -304,22 +304,22 @@
   </synapse>
   <synapse id="23" priority="1000000">
     <action_set>
-      <pseudo_event id="83" operation="stopped" operation_key="redis-master_stopped_0">
+      <pseudo_event id="81" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0">
+      <pseudo_event id="80" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -328,26 +328,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="83" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="104" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="105" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="103" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="103" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
@@ -357,13 +357,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
+        <pseudo_event id="102" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="104" operation="stop" operation_key="ip-172.17.1.14_stop_0">
+      <pseudo_event id="102" 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"/>
       </pseudo_event>
     </action_set>
@@ -372,26 +372,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="107" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="106" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="106" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
@@ -401,13 +401,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
+        <pseudo_event id="105" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="107" operation="stop" operation_key="ip-172.17.1.17_stop_0">
+      <pseudo_event id="105" 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"/>
       </pseudo_event>
     </action_set>
@@ -416,26 +416,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="112" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="113" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="111" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="111" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
@@ -445,13 +445,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
+        <pseudo_event id="110" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <pseudo_event id="112" operation="stop" operation_key="ip-172.17.4.11_stop_0">
+      <pseudo_event id="110" 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"/>
       </pseudo_event>
     </action_set>
@@ -460,13 +460,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="34">
     <action_set>
-      <pseudo_event id="115" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
+      <pseudo_event id="113" 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" />
       </pseudo_event>
     </action_set>
@@ -475,28 +475,28 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="120" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35" priority="1000000">
     <action_set>
-      <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0">
+      <pseudo_event id="121" 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" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="115" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
+        <pseudo_event id="113" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="120" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36">
     <action_set>
-      <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0">
+      <pseudo_event id="120" 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" />
       </pseudo_event>
     </action_set>
@@ -508,76 +508,6 @@
   </synapse>
   <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="126" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="7" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="127" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="42">
-    <action_set>
-      <rsc_op id="12" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="23" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <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"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" 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"/>
@@ -589,7 +519,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="38">
     <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"/>
@@ -602,7 +532,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="39">
     <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"/>
@@ -610,7 +540,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="46">
+  <synapse id="40">
     <action_set>
       <crm_event id="1" 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" />
diff --git a/cts/scheduler/remote-recover-connection.scores b/cts/scheduler/remote-recover-connection.scores
index 328f1d3..391d7c8 100644
--- a/cts/scheduler/remote-recover-connection.scores
+++ b/cts/scheduler/remote-recover-connection.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Using the original execution date of: 2017-05-03 13:33:24Z
 galera:0 promotion score on galera-1: 100
 galera:1 promotion score on galera-2: 100
diff --git a/cts/scheduler/remote-recover-connection.summary b/cts/scheduler/remote-recover-connection.summary
index bacd5a9..f87c150 100644
--- a/cts/scheduler/remote-recover-connection.summary
+++ b/cts/scheduler/remote-recover-connection.summary
@@ -37,6 +37,10 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-525400b4f6bd	(stonith:fence_ipmilan):	 Started controller-0
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	 Started controller-1 (UNCLEAN)
 
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Transition Summary:
  * Fence (reboot) controller-1 'peer is no longer part of the cluster'
  * Move       messaging-1                            ( controller-1 -> controller-2 )  
@@ -47,8 +51,6 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop       haproxy:0                              (                 controller-1 )   due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
@@ -56,12 +58,6 @@ Executing cluster transition:
  * Pseudo action:   galera-0_stop_0
  * Pseudo action:   galera-2_stop_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
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
  * Pseudo action:   stonith-fence_ipmilan-5254005bdbb5_stop_0
  * Fencing controller-1 (reboot)
  * Resource action: messaging-1     start on controller-2
diff --git a/cts/scheduler/remote-recover-no-resources.dot b/cts/scheduler/remote-recover-no-resources.dot
index 8db3fb6..bae902f 100644
--- a/cts/scheduler/remote-recover-no-resources.dot
+++ b/cts/scheduler/remote-recover-no-resources.dot
@@ -102,22 +102,10 @@
 "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold]
 "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold]
 "stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
 "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/remote-recover-no-resources.exp b/cts/scheduler/remote-recover-no-resources.exp
index 90470fb..394933f 100644
--- a/cts/scheduler/remote-recover-no-resources.exp
+++ b/cts/scheduler/remote-recover-no-resources.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <pseudo_event id="25" operation="stop" operation_key="messaging-1_stop_0">
+      <pseudo_event id="23" operation="stop" operation_key="messaging-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -9,27 +9,27 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="30" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="28" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="29" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="27" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="29" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="27" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="stop" operation_key="galera-0_stop_0"/>
+        <pseudo_event id="26" operation="stop" operation_key="galera-0_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -38,7 +38,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="28" operation="stop" operation_key="galera-0_stop_0">
+      <pseudo_event id="26" operation="stop" operation_key="galera-0_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -46,7 +46,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="33" operation="stop" operation_key="galera-2_stop_0">
+      <pseudo_event id="31" operation="stop" operation_key="galera-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -110,13 +110,13 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="38" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
+      <pseudo_event id="36" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
         <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_notify_stop_resource="rabbitmq:2" CRM_meta_notify_stop_uname="messaging-1" CRM_meta_timeout="200000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="41" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="39" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -125,22 +125,22 @@
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="42" operation="stopped" operation_key="rabbitmq-clone_stopped_0">
+      <pseudo_event id="40" 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>
-        <pseudo_event id="38" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
+        <pseudo_event id="36" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="41" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="39" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="41" operation="stop" operation_key="rabbitmq-clone_stop_0">
+      <pseudo_event id="39" 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>
@@ -159,7 +159,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="29" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="27" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -195,7 +195,7 @@
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="59" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
+      <pseudo_event id="57" 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-0 controller-1 controller-2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
@@ -204,7 +204,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="72" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="70" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -217,7 +217,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="74" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="72" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -230,7 +230,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="76" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="74" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="122" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -246,7 +246,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="74" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="72" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -259,7 +259,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="76" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="74" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="122" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -268,13 +268,13 @@
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="77" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="75" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="76" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="74" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="124" 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"/>
@@ -286,28 +286,28 @@
   </synapse>
   <synapse id="21" priority="1000000">
     <action_set>
-      <pseudo_event id="76" operation="notify" operation_key="redis-master_post_notify_stopped_0">
+      <pseudo_event id="74" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="73" operation="stopped" operation_key="redis-master_stopped_0"/>
+        <pseudo_event id="71" operation="stopped" operation_key="redis-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="75" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="73" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="75" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="73" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="74" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="72" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="187" 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"/>
@@ -319,7 +319,7 @@
   </synapse>
   <synapse id="23">
     <action_set>
-      <pseudo_event id="74" operation="notify" operation_key="redis-master_pre_notify_stop_0">
+      <pseudo_event id="72" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -327,22 +327,22 @@
   </synapse>
   <synapse id="24" priority="1000000">
     <action_set>
-      <pseudo_event id="73" operation="stopped" operation_key="redis-master_stopped_0">
+      <pseudo_event id="71" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="59" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
+        <pseudo_event id="57" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="72" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="70" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <pseudo_event id="72" operation="stop" operation_key="redis-master_stop_0">
+      <pseudo_event id="70" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -351,26 +351,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="75" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="73" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="96" operation="monitor" operation_key="ip-172.17.1.14_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="94" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="95" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="93" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <rsc_op id="95" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="93" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
@@ -380,7 +380,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="94" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
+        <pseudo_event id="92" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -389,7 +389,7 @@
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="94" operation="stop" operation_key="ip-172.17.1.14_stop_0">
+      <pseudo_event id="92" 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"/>
       </pseudo_event>
     </action_set>
@@ -398,26 +398,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="113" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="111" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <rsc_op id="99" operation="monitor" operation_key="ip-172.17.1.17_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="97" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="98" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="96" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <rsc_op id="98" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="96" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
@@ -427,7 +427,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="97" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
+        <pseudo_event id="95" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -436,7 +436,7 @@
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="97" operation="stop" operation_key="ip-172.17.1.17_stop_0">
+      <pseudo_event id="95" 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"/>
       </pseudo_event>
     </action_set>
@@ -445,26 +445,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="113" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="111" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="104" operation="monitor" operation_key="ip-172.17.4.11_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="102" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="103" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="101" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="103" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="101" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
@@ -474,7 +474,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="102" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
+        <pseudo_event id="100" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -483,7 +483,7 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <pseudo_event id="102" operation="stop" operation_key="ip-172.17.4.11_stop_0">
+      <pseudo_event id="100" 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"/>
       </pseudo_event>
     </action_set>
@@ -492,13 +492,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="113" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="111" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35">
     <action_set>
-      <pseudo_event id="105" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
+      <pseudo_event id="103" 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" />
       </pseudo_event>
     </action_set>
@@ -507,28 +507,28 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="110" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36" priority="1000000">
     <action_set>
-      <pseudo_event id="113" operation="stopped" operation_key="haproxy-clone_stopped_0">
+      <pseudo_event id="111" 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" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="105" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
+        <pseudo_event id="103" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="110" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="37">
     <action_set>
-      <pseudo_event id="112" operation="stop" operation_key="haproxy-clone_stop_0">
+      <pseudo_event id="110" 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" />
       </pseudo_event>
     </action_set>
@@ -540,82 +540,6 @@
   </synapse>
   <synapse id="38">
     <action_set>
-      <rsc_op id="116" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="21" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="116" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="40">
-    <action_set>
-      <rsc_op id="7" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="41">
-    <action_set>
-      <rsc_op id="117" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="42">
-    <action_set>
-      <rsc_op id="22" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="117" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="43">
-    <action_set>
-      <rsc_op id="12" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="44">
-    <action_set>
       <rsc_op id="120" 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"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" 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"/>
@@ -627,7 +551,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="39">
     <action_set>
       <rsc_op id="119" 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"/>
@@ -643,7 +567,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="46">
+  <synapse id="40">
     <action_set>
       <pseudo_event id="118" 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"/>
@@ -651,7 +575,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="47">
+  <synapse id="41">
     <action_set>
       <crm_event id="121" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1">
         <attributes CRM_meta_last_failure_rabbitmq="1493336946" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_rabbitmq_role="true" CRM_meta_rmq_node_attr_last_known_rabbitmq="rabbit@messaging-1" CRM_meta_rmq_node_attr_rabbitmq="rabbit@messaging-1" CRM_meta_stonith_action="reboot" />
@@ -666,7 +590,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48">
+  <synapse id="42">
     <action_set>
       <crm_event id="1" 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" />
diff --git a/cts/scheduler/remote-recover-no-resources.scores b/cts/scheduler/remote-recover-no-resources.scores
index 378974e..cd4444c 100644
--- a/cts/scheduler/remote-recover-no-resources.scores
+++ b/cts/scheduler/remote-recover-no-resources.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Using the original execution date of: 2017-05-03 13:33:24Z
 galera:0 promotion score on galera-1: 100
 galera:1 promotion score on galera-0: 100
diff --git a/cts/scheduler/remote-recover-no-resources.summary b/cts/scheduler/remote-recover-no-resources.summary
index 7f2a90c..16ac8ac 100644
--- a/cts/scheduler/remote-recover-no-resources.summary
+++ b/cts/scheduler/remote-recover-no-resources.summary
@@ -37,6 +37,10 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-525400b4f6bd	(stonith:fence_ipmilan):	 Started controller-0
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	 Started controller-1 (UNCLEAN)
 
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Transition Summary:
  * Fence (reboot) messaging-1 'resources are active and the connection is unrecoverable'
  * Fence (reboot) controller-1 'peer is no longer part of the cluster'
@@ -49,8 +53,6 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop       haproxy:0                              (                 controller-1 )   due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
@@ -58,8 +60,6 @@ Executing cluster transition:
  * Pseudo action:   galera-0_stop_0
  * Pseudo action:   galera-2_stop_0
  * Pseudo action:   redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
  * Pseudo action:   stonith-fence_ipmilan-5254005bdbb5_stop_0
  * Fencing controller-1 (reboot)
  * Pseudo action:   redis_post_notify_stop_0
@@ -77,10 +77,6 @@ Executing cluster transition:
  * Pseudo action:   redis-master_stopped_0
  * Pseudo action:   haproxy_stop_0
  * Pseudo action:   haproxy-clone_stopped_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
  * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
  * Resource action: galera-0        monitor=20000 on controller-2
  * Resource action: rabbitmq        notify on messaging-2
diff --git a/cts/scheduler/remote-recover-unknown.dot b/cts/scheduler/remote-recover-unknown.dot
index 902e0b5..eea6eea 100644
--- a/cts/scheduler/remote-recover-unknown.dot
+++ b/cts/scheduler/remote-recover-unknown.dot
@@ -101,8 +101,6 @@
 "stonith 'reboot' galera-2" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold]
 "stonith 'reboot' galera-2" -> "stonith 'reboot' messaging-1" [ style = bold]
 "stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
-"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
 "stonith 'reboot' galera-2" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' messaging-1" -> "galera-0_start_0 controller-2" [ style = bold]
 "stonith 'reboot' messaging-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold]
@@ -112,22 +110,10 @@
 "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold]
 "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold]
 "stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
 "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/remote-recover-unknown.exp b/cts/scheduler/remote-recover-unknown.exp
index 82cb65f..1d14684 100644
--- a/cts/scheduler/remote-recover-unknown.exp
+++ b/cts/scheduler/remote-recover-unknown.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0">
+      <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -9,27 +9,27 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="31" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="29" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
+        <pseudo_event id="27" operation="stop" operation_key="galera-0_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -41,7 +41,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0">
+      <pseudo_event id="27" operation="stop" operation_key="galera-0_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -49,7 +49,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="galera-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -113,13 +113,13 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="39" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
+      <pseudo_event id="37" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0">
         <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_notify_stop_resource="rabbitmq:2" CRM_meta_notify_stop_uname="messaging-1" CRM_meta_timeout="200000"  set_policy="ha-all ^(?!amq\.).* {&quot;ha-mode&quot;:&quot;exactly&quot;,&quot;ha-params&quot;:2}"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="40" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -128,22 +128,22 @@
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="43" operation="stopped" operation_key="rabbitmq-clone_stopped_0">
+      <pseudo_event id="41" 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>
-        <pseudo_event id="39" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
+        <pseudo_event id="37" operation="stop" operation_key="rabbitmq_stop_0" internal_operation_key="rabbitmq:2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
+        <pseudo_event id="40" operation="stop" operation_key="rabbitmq-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="42" operation="stop" operation_key="rabbitmq-clone_stop_0">
+      <pseudo_event id="40" 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>
@@ -162,7 +162,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="28" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -198,7 +198,7 @@
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="60" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
+      <pseudo_event id="58" 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-0 controller-1 controller-2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
@@ -207,7 +207,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="71" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -220,7 +220,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="73" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -233,7 +233,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="124" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -249,7 +249,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="73" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -262,7 +262,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="124" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -271,13 +271,13 @@
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="78" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="76" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="75" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="126" 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"/>
@@ -289,28 +289,28 @@
   </synapse>
   <synapse id="21" priority="1000000">
     <action_set>
-      <pseudo_event id="77" operation="notify" operation_key="redis-master_post_notify_stopped_0">
+      <pseudo_event id="75" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="74" operation="stopped" operation_key="redis-master_stopped_0"/>
+        <pseudo_event id="72" operation="stopped" operation_key="redis-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="76" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="74" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="76" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="74" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="73" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="190" 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"/>
@@ -322,7 +322,7 @@
   </synapse>
   <synapse id="23">
     <action_set>
-      <pseudo_event id="75" operation="notify" operation_key="redis-master_pre_notify_stop_0">
+      <pseudo_event id="73" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -330,22 +330,22 @@
   </synapse>
   <synapse id="24" priority="1000000">
     <action_set>
-      <pseudo_event id="74" operation="stopped" operation_key="redis-master_stopped_0">
+      <pseudo_event id="72" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="60" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
+        <pseudo_event id="58" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="71" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <pseudo_event id="73" operation="stop" operation_key="redis-master_stop_0">
+      <pseudo_event id="71" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -354,26 +354,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="76" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="74" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="97" operation="monitor" operation_key="ip-172.17.1.14_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="95" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="96" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="94" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <rsc_op id="96" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="94" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
@@ -383,7 +383,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="95" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
+        <pseudo_event id="93" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -395,7 +395,7 @@
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="95" operation="stop" operation_key="ip-172.17.1.14_stop_0">
+      <pseudo_event id="93" 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"/>
       </pseudo_event>
     </action_set>
@@ -404,26 +404,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="112" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <rsc_op id="100" operation="monitor" operation_key="ip-172.17.1.17_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="98" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="99" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="97" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <rsc_op id="99" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="97" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
@@ -433,7 +433,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="98" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
+        <pseudo_event id="96" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -445,7 +445,7 @@
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="98" operation="stop" operation_key="ip-172.17.1.17_stop_0">
+      <pseudo_event id="96" 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"/>
       </pseudo_event>
     </action_set>
@@ -454,26 +454,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="112" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="105" operation="monitor" operation_key="ip-172.17.4.11_monitor_10000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="103" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="104" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="102" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="104" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="102" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
@@ -483,7 +483,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="103" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
+        <pseudo_event id="101" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
@@ -495,7 +495,7 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <pseudo_event id="103" operation="stop" operation_key="ip-172.17.4.11_stop_0">
+      <pseudo_event id="101" 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"/>
       </pseudo_event>
     </action_set>
@@ -504,13 +504,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="112" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35">
     <action_set>
-      <pseudo_event id="106" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
+      <pseudo_event id="104" 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" />
       </pseudo_event>
     </action_set>
@@ -519,28 +519,28 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="113" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="111" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36" priority="1000000">
     <action_set>
-      <pseudo_event id="114" operation="stopped" operation_key="haproxy-clone_stopped_0">
+      <pseudo_event id="112" 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" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="106" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
+        <pseudo_event id="104" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="113" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="111" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="37">
     <action_set>
-      <pseudo_event id="113" operation="stop" operation_key="haproxy-clone_stop_0">
+      <pseudo_event id="111" 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" />
       </pseudo_event>
     </action_set>
@@ -552,88 +552,6 @@
   </synapse>
   <synapse id="38">
     <action_set>
-      <rsc_op id="117" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="21" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="117" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="123" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="40">
-    <action_set>
-      <rsc_op id="7" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="41">
-    <action_set>
-      <rsc_op id="118" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="42">
-    <action_set>
-      <rsc_op id="22" 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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="118" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="123" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="43">
-    <action_set>
-      <rsc_op id="12" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="44">
-    <action_set>
       <rsc_op id="121" 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"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" 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"/>
@@ -645,7 +563,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="39">
     <action_set>
       <rsc_op id="120" 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"/>
@@ -664,7 +582,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="46">
+  <synapse id="40">
     <action_set>
       <pseudo_event id="119" 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"/>
@@ -672,7 +590,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="47">
+  <synapse id="41">
     <action_set>
       <crm_event id="123" operation="stonith" operation_key="stonith-galera-2-reboot" on_node="galera-2" on_node_uuid="galera-2">
         <attributes CRM_meta_galera_role="true" CRM_meta_last_failure_galera="1493172798" CRM_meta_master_galera="100" CRM_meta_on_node="galera-2" CRM_meta_on_node_uuid="galera-2" CRM_meta_stonith_action="reboot" />
@@ -687,7 +605,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="48">
+  <synapse id="42">
     <action_set>
       <crm_event id="122" operation="stonith" operation_key="stonith-messaging-1-reboot" on_node="messaging-1" on_node_uuid="messaging-1">
         <attributes CRM_meta_last_failure_rabbitmq="1493336946" CRM_meta_on_node="messaging-1" CRM_meta_on_node_uuid="messaging-1" CRM_meta_rabbitmq_role="true" CRM_meta_rmq_node_attr_last_known_rabbitmq="rabbit@messaging-1" CRM_meta_rmq_node_attr_rabbitmq="rabbit@messaging-1" CRM_meta_stonith_action="reboot" />
@@ -702,7 +620,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="49">
+  <synapse id="43">
     <action_set>
       <crm_event id="1" 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" />
diff --git a/cts/scheduler/remote-recover-unknown.scores b/cts/scheduler/remote-recover-unknown.scores
index 378974e..cd4444c 100644
--- a/cts/scheduler/remote-recover-unknown.scores
+++ b/cts/scheduler/remote-recover-unknown.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Using the original execution date of: 2017-05-03 13:33:24Z
 galera:0 promotion score on galera-1: 100
 galera:1 promotion score on galera-0: 100
diff --git a/cts/scheduler/remote-recover-unknown.summary b/cts/scheduler/remote-recover-unknown.summary
index 330c4cb..af5f724 100644
--- a/cts/scheduler/remote-recover-unknown.summary
+++ b/cts/scheduler/remote-recover-unknown.summary
@@ -37,6 +37,10 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-525400b4f6bd	(stonith:fence_ipmilan):	 Started controller-0
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	 Started controller-1 (UNCLEAN)
 
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Transition Summary:
  * Fence (reboot) galera-2 'resources are in an unknown state and the connection is unrecoverable'
  * Fence (reboot) messaging-1 'resources are active and the connection is unrecoverable'
@@ -50,8 +54,6 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop       haproxy:0                              (                 controller-1 )   due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
@@ -59,8 +61,6 @@ Executing cluster transition:
  * Pseudo action:   galera-0_stop_0
  * Pseudo action:   galera-2_stop_0
  * Pseudo action:   redis-master_pre_notify_stop_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
  * Pseudo action:   stonith-fence_ipmilan-5254005bdbb5_stop_0
  * Fencing controller-1 (reboot)
  * Pseudo action:   redis_post_notify_stop_0
@@ -79,10 +79,6 @@ Executing cluster transition:
  * Pseudo action:   redis-master_stopped_0
  * Pseudo action:   haproxy_stop_0
  * Pseudo action:   haproxy-clone_stopped_0
- * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
  * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2
  * Resource action: galera-0        monitor=20000 on controller-2
  * Resource action: rabbitmq        notify on messaging-2
diff --git a/cts/scheduler/remote-recovery.dot b/cts/scheduler/remote-recovery.dot
index 33c4fd0..86192f3 100644
--- a/cts/scheduler/remote-recovery.dot
+++ b/cts/scheduler/remote-recovery.dot
@@ -95,14 +95,4 @@
 "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold]
 "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"]
-"stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold]
-"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/cts/scheduler/remote-recovery.exp b/cts/scheduler/remote-recovery.exp
index d1d33c8..cfcba98 100644
--- a/cts/scheduler/remote-recovery.exp
+++ b/cts/scheduler/remote-recovery.exp
@@ -1,33 +1,33 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="28" operation="monitor" operation_key="messaging-1_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="26" operation="monitor" operation_key="messaging-1_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="messaging-1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="messaging-1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0"/>
+        <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="26" operation="stop" operation_key="messaging-1_stop_0">
+      <pseudo_event id="24" operation="stop" operation_key="messaging-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -35,33 +35,33 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="33" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="31" operation="monitor" operation_key="galera-0_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-0" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="galera-0_stop_0"/>
+        <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="31" operation="stop" operation_key="galera-0_stop_0">
+      <pseudo_event id="29" operation="stop" operation_key="galera-0_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -69,33 +69,33 @@
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="38" operation="monitor" operation_key="galera-2_monitor_20000" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="36" operation="monitor" operation_key="galera-2_monitor_20000" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="20000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000"  reconnect_interval="60"/>
       </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"/>
+        <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3">
+      <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3">
         <primitive id="galera-2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="galera-2_stop_0"/>
+        <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="36" operation="stop" operation_key="galera-2_stop_0">
+      <pseudo_event id="34" operation="stop" operation_key="galera-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="60000"  reconnect_interval="60"/>
       </pseudo_event>
     </action_set>
@@ -110,7 +110,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="27" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="25" operation="start" operation_key="messaging-1_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -123,7 +123,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="35" operation="start" operation_key="galera-2_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -136,7 +136,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="30" operation="start" operation_key="galera-0_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
@@ -172,7 +172,7 @@
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0">
+      <pseudo_event id="67" 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-0 controller-1 controller-2" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="200000"  wait_last_known_master="true"/>
       </pseudo_event>
     </action_set>
@@ -181,7 +181,7 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -194,7 +194,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -207,7 +207,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="131" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -223,7 +223,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -236,7 +236,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="131" operation="notify" operation_key="redis_post_notify_stop_0" internal_operation_key="redis:0_post_notify_stonith_0"/>
@@ -245,13 +245,13 @@
   </synapse>
   <synapse id="19" priority="1000000">
     <action_set>
-      <pseudo_event id="87" operation="notified" operation_key="redis-master_confirmed-post_notify_stopped_0">
+      <pseudo_event id="85" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
+        <pseudo_event id="84" operation="notify" operation_key="redis-master_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="133" 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"/>
@@ -263,28 +263,28 @@
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="86" operation="notify" operation_key="redis-master_post_notify_stopped_0">
+      <pseudo_event id="84" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="83" operation="stopped" operation_key="redis-master_stopped_0"/>
+        <pseudo_event id="81" operation="stopped" operation_key="redis-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="83" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0">
+      <pseudo_event id="83" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
+        <pseudo_event id="82" operation="notify" operation_key="redis-master_pre_notify_stop_0"/>
       </trigger>
       <trigger>
         <rsc_op id="187" 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"/>
@@ -296,7 +296,7 @@
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="84" operation="notify" operation_key="redis-master_pre_notify_stop_0">
+      <pseudo_event id="82" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -304,22 +304,22 @@
   </synapse>
   <synapse id="23" priority="1000000">
     <action_set>
-      <pseudo_event id="83" operation="stopped" operation_key="redis-master_stopped_0">
+      <pseudo_event id="81" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="69" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="redis_stop_0" internal_operation_key="redis:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0"/>
+        <pseudo_event id="80" operation="stop" operation_key="redis-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="82" operation="stop" operation_key="redis-master_stop_0">
+      <pseudo_event id="80" 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_promoted_max="1" CRM_meta_promoted_node_max="1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -328,26 +328,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="85" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="83" operation="notified" operation_key="redis-master_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="104" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="105" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="103" operation="start" operation_key="ip-172.17.1.14_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="103" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.14"/>
       </rsc_op>
@@ -357,13 +357,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
+        <pseudo_event id="102" operation="stop" operation_key="ip-172.17.1.14_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="104" operation="stop" operation_key="ip-172.17.1.14_stop_0">
+      <pseudo_event id="102" 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"/>
       </pseudo_event>
     </action_set>
@@ -372,26 +372,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="107" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="108" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="106" operation="start" operation_key="ip-172.17.1.17_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="106" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.1.17"/>
       </rsc_op>
@@ -401,13 +401,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="107" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
+        <pseudo_event id="105" operation="stop" operation_key="ip-172.17.1.17_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="107" operation="stop" operation_key="ip-172.17.1.17_stop_0">
+      <pseudo_event id="105" 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"/>
       </pseudo_event>
     </action_set>
@@ -416,26 +416,26 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="112" 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"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="113" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
+        <rsc_op id="111" operation="start" operation_key="ip-172.17.4.11_start_0" on_node="controller-2" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <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">
+      <rsc_op id="111" 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"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="172.17.4.11"/>
       </rsc_op>
@@ -445,13 +445,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="112" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
+        <pseudo_event id="110" operation="stop" operation_key="ip-172.17.4.11_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <pseudo_event id="112" operation="stop" operation_key="ip-172.17.4.11_stop_0">
+      <pseudo_event id="110" 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"/>
       </pseudo_event>
     </action_set>
@@ -460,13 +460,13 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
+        <pseudo_event id="121" operation="stopped" operation_key="haproxy-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="34">
     <action_set>
-      <pseudo_event id="115" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0">
+      <pseudo_event id="113" 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" />
       </pseudo_event>
     </action_set>
@@ -475,28 +475,28 @@
         <crm_event id="1" operation="stonith" operation_key="stonith-controller-1-reboot" on_node="controller-1" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="120" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35" priority="1000000">
     <action_set>
-      <pseudo_event id="123" operation="stopped" operation_key="haproxy-clone_stopped_0">
+      <pseudo_event id="121" 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" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="115" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
+        <pseudo_event id="113" operation="stop" operation_key="haproxy_stop_0" internal_operation_key="haproxy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0"/>
+        <pseudo_event id="120" operation="stop" operation_key="haproxy-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36">
     <action_set>
-      <pseudo_event id="122" operation="stop" operation_key="haproxy-clone_stop_0">
+      <pseudo_event id="120" 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" />
       </pseudo_event>
     </action_set>
@@ -508,76 +508,6 @@
   </synapse>
   <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="126" operation="stop" operation_key="stonith-fence_ipmilan-525400bbf613_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="39">
-    <action_set>
-      <rsc_op id="7" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6237" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-2" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="22" operation="start" operation_key="stonith-fence_ipmilan-525400bbf613_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <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"/>
-        <attributes CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="127" operation="stop" operation_key="stonith-fence_ipmilan-525400b4f6bd_stop_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="42">
-    <action_set>
-      <rsc_op id="12" 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"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" action="reboot"  ipaddr="172.16.0.1" ipport="6236" lanplus="true" login="admin" passwd="****" pcmk_host_list="controller-1" privlvl="administrator"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="23" operation="start" operation_key="stonith-fence_ipmilan-525400b4f6bd_start_0" on_node="controller-0" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <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"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="controller-2" CRM_meta_on_node_uuid="3" 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"/>
@@ -589,7 +519,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="38">
     <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"/>
@@ -602,7 +532,7 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="45">
+  <synapse id="39">
     <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"/>
@@ -610,7 +540,7 @@
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="46">
+  <synapse id="40">
     <action_set>
       <crm_event id="1" 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" />
diff --git a/cts/scheduler/remote-recovery.scores b/cts/scheduler/remote-recovery.scores
index 328f1d3..391d7c8 100644
--- a/cts/scheduler/remote-recovery.scores
+++ b/cts/scheduler/remote-recovery.scores
@@ -1,4 +1,8 @@
 Allocation scores:
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Using the original execution date of: 2017-05-03 13:33:24Z
 galera:0 promotion score on galera-1: 100
 galera:1 promotion score on galera-2: 100
diff --git a/cts/scheduler/remote-recovery.summary b/cts/scheduler/remote-recovery.summary
index bacd5a9..f87c150 100644
--- a/cts/scheduler/remote-recovery.summary
+++ b/cts/scheduler/remote-recovery.summary
@@ -37,6 +37,10 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-525400b4f6bd	(stonith:fence_ipmilan):	 Started controller-0
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	 Started controller-1 (UNCLEAN)
 
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_start_0 on controller-0 changed: 0:0;124:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400bbf613_monitor_60000 on controller-0 changed: 0:0;129:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_start_0 on controller-0 changed: 0:0;126:17:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
+Only 'private' parameters to stonith-fence_ipmilan-525400b4f6bd_monitor_60000 on controller-0 changed: 0:0;132:18:0:e47e0f5b-bac4-432e-9993-f38bc43128ea
 Transition Summary:
  * Fence (reboot) controller-1 'peer is no longer part of the cluster'
  * Move       messaging-1                            ( controller-1 -> controller-2 )  
@@ -47,8 +51,6 @@ Transition Summary:
  * Move       ip-172.17.1.17                         ( controller-1 -> controller-2 )  
  * Move       ip-172.17.4.11                         ( controller-1 -> controller-2 )  
  * Stop       haproxy:0                              (                 controller-1 )   due to node availability
- * Restart    stonith-fence_ipmilan-525400bbf613     (                 controller-0 )   due to resource definition change
- * Restart    stonith-fence_ipmilan-525400b4f6bd     (                 controller-0 )   due to resource definition change
  * Move       stonith-fence_ipmilan-5254005bdbb5     ( controller-1 -> controller-2 )  
 
 Executing cluster transition:
@@ -56,12 +58,6 @@ Executing cluster transition:
  * Pseudo action:   galera-0_stop_0
  * Pseudo action:   galera-2_stop_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
- * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd stop on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0
- * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0
  * Pseudo action:   stonith-fence_ipmilan-5254005bdbb5_stop_0
  * Fencing controller-1 (reboot)
  * Resource action: messaging-1     start on controller-2