Blob Blame History Raw
From fc69905f116e41a724fdde160c83111d22ae8b2e Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Tue, 25 Jul 2017 09:24:57 +1000
Subject: [PATCH 01/12] Log: PE: Ignore optional unfencing events and report
 the fencing type

---
 pengine/allocate.c                                   | 10 +++++++---
 pengine/test10/594.summary                           |  2 +-
 pengine/test10/829.summary                           |  2 +-
 pengine/test10/bug-5186-partial-migrate.summary      |  2 +-
 pengine/test10/bug-cl-5247.summary                   |  2 +-
 pengine/test10/bug-lf-2508.summary                   |  2 +-
 pengine/test10/bug-lf-2551.summary                   |  2 +-
 pengine/test10/bug-lf-2606.summary                   |  2 +-
 pengine/test10/bug-rh-1097457.summary                |  2 +-
 pengine/test10/concurrent-fencing.summary            |  6 +++---
 pengine/test10/guest-node-host-dies.summary          |  6 +++---
 pengine/test10/interleave-pseudo-stop.summary        |  2 +-
 pengine/test10/master-7.summary                      |  2 +-
 pengine/test10/master-8.summary                      |  2 +-
 pengine/test10/migrate-fencing.summary               |  2 +-
 pengine/test10/rec-node-11.summary                   |  2 +-
 pengine/test10/rec-node-12.summary                   |  2 +-
 pengine/test10/rec-node-13.summary                   |  2 +-
 pengine/test10/rec-node-14.summary                   |  6 +++---
 pengine/test10/rec-node-15.summary                   |  2 +-
 pengine/test10/rec-node-2.summary                    |  2 +-
 pengine/test10/rec-node-4.summary                    |  2 +-
 pengine/test10/rec-node-6.summary                    |  2 +-
 pengine/test10/rec-node-7.summary                    |  2 +-
 pengine/test10/rec-rsc-5.summary                     |  2 +-
 pengine/test10/remote-fence-before-reconnect.summary |  2 +-
 pengine/test10/remote-fence-unclean-3.summary        |  2 +-
 pengine/test10/remote-fence-unclean.summary          |  2 +-
 pengine/test10/remote-fence-unclean2.summary         |  2 +-
 pengine/test10/remote-partial-migrate2.summary       |  2 +-
 pengine/test10/remote-recover-all.summary            |  6 +++---
 pengine/test10/remote-recover-connection.summary     |  2 +-
 pengine/test10/remote-recover-fail.summary           |  2 +-
 pengine/test10/remote-recover-no-resources.summary   |  4 ++--
 pengine/test10/remote-recover-unknown.summary        |  6 +++---
 pengine/test10/remote-recovery.summary               |  2 +-
 pengine/test10/remote-unclean2.summary               |  2 +-
 pengine/test10/start-then-stop-with-unfence.summary  |  3 +--
 pengine/test10/stonith-0.summary                     |  4 ++--
 pengine/test10/stonith-1.summary                     |  2 +-
 pengine/test10/stonith-2.summary                     |  2 +-
 pengine/test10/stonith-3.summary                     |  2 +-
 pengine/test10/stonith-4.summary                     |  8 ++++----
 pengine/test10/stop-failure-no-quorum.summary        |  2 +-
 pengine/test10/stop-failure-with-fencing.summary     |  2 +-
 pengine/test10/systemhealth1.summary                 |  4 ++--
 pengine/test10/systemhealth2.summary                 |  2 +-
 pengine/test10/systemhealth3.summary                 |  2 +-
 pengine/test10/systemhealthm1.summary                |  4 ++--
 pengine/test10/systemhealthm2.summary                |  2 +-
 pengine/test10/systemhealthm3.summary                |  2 +-
 pengine/test10/systemhealthn1.summary                |  4 ++--
 pengine/test10/systemhealthn2.summary                |  2 +-
 pengine/test10/systemhealthn3.summary                |  2 +-
 pengine/test10/systemhealtho1.summary                |  4 ++--
 pengine/test10/systemhealtho2.summary                |  2 +-
 pengine/test10/systemhealtho3.summary                |  2 +-
 pengine/test10/systemhealthp1.summary                |  4 ++--
 pengine/test10/systemhealthp2.summary                |  2 +-
 pengine/test10/systemhealthp3.summary                |  2 +-
 pengine/test10/ticket-clone-21.summary               |  4 ++--
 pengine/test10/ticket-clone-9.summary                |  4 ++--
 pengine/test10/ticket-group-21.summary               |  2 +-
 pengine/test10/ticket-group-9.summary                |  2 +-
 pengine/test10/ticket-master-21.summary              |  2 +-
 pengine/test10/ticket-master-9.summary               |  2 +-
 pengine/test10/ticket-primitive-21.summary           |  2 +-
 pengine/test10/ticket-primitive-9.summary            |  2 +-
 pengine/test10/unfence-definition.summary            |  8 +++-----
 pengine/test10/unfence-parameters.summary            |  9 ++++-----
 pengine/test10/unfence-startup.summary               |  7 ++-----
 pengine/test10/whitebox-fail1.summary                |  2 +-
 pengine/test10/whitebox-fail2.summary                |  2 +-
 pengine/test10/whitebox-imply-stop-on-fence.summary  |  6 +++---
 pengine/test10/whitebox-ms-ordering.summary          |  4 ++--
 pengine/test10/whitebox-unexpectedly-running.summary |  2 +-
 76 files changed, 113 insertions(+), 116 deletions(-)

diff --git a/pengine/allocate.c b/pengine/allocate.c
index 3a883ad..8ea2ea1 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -2419,11 +2419,13 @@ LogNodeActions(pe_working_set_t * data_set, gboolean terminal)
 
     for (gIter = data_set->actions; gIter != NULL; gIter = gIter->next) {
         char *node_name = NULL;
-        const char *task = NULL;
+        char *task = NULL;
         action_t *action = (action_t *) gIter->data;
 
         if (action->rsc != NULL) {
             continue;
+        } else if (is_set(action->flags, pe_action_optional)) {
+            continue;
         }
 
         if (is_container_remote_node(action->node)) {
@@ -2433,9 +2435,10 @@ LogNodeActions(pe_working_set_t * data_set, gboolean terminal)
         }
 
         if (safe_str_eq(action->task, CRM_OP_SHUTDOWN)) {
-            task = "Shutdown";
+            task = strdup("Shutdown");
         } else if (safe_str_eq(action->task, CRM_OP_FENCE)) {
-            task = "Fence";
+            const char *op = g_hash_table_lookup(action->meta, "stonith_action");
+            task = crm_strdup_printf("Fence (%s)", op);
         }
 
         if(task == NULL) {
@@ -2447,6 +2450,7 @@ LogNodeActions(pe_working_set_t * data_set, gboolean terminal)
         }
 
         free(node_name);
+        free(task);
     }
 }
 
diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary
index d9fe8c1..ef2a02c 100644
--- a/pengine/test10/594.summary
+++ b/pengine/test10/594.summary
@@ -13,7 +13,7 @@ Online: [ hadev1 hadev2 ]
      child_DoFencing:2	(stonith:ssh):	Started hadev1
 
 Transition Summary:
- * Fence hadev3
+ * Fence (reboot) hadev3
  * Shutdown hadev2
  * Move    DcIPaddr	(Started hadev2 -> hadev1)
  * Move    rsc_hadev2	(Started hadev2 -> hadev1)
diff --git a/pengine/test10/829.summary b/pengine/test10/829.summary
index a9d25e0..556699f 100644
--- a/pengine/test10/829.summary
+++ b/pengine/test10/829.summary
@@ -15,7 +15,7 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:3	(stonith:ssh):	Started c001n08
 
 Transition Summary:
- * Fence c001n02
+ * Fence (reboot) c001n02
  * Move    rsc_c001n02	(Started c001n02 -> c001n01)
  * Stop    child_DoFencing:0	(c001n02)
 
diff --git a/pengine/test10/bug-5186-partial-migrate.summary b/pengine/test10/bug-5186-partial-migrate.summary
index 63ed2d7..a32e81d 100644
--- a/pengine/test10/bug-5186-partial-migrate.summary
+++ b/pengine/test10/bug-5186-partial-migrate.summary
@@ -25,7 +25,7 @@ Online: [ bl460g1n6 bl460g1n8 ]
      Started: [ bl460g1n6 bl460g1n8 ]
 
 Transition Summary:
- * Fence bl460g1n7
+ * Fence (reboot) bl460g1n7
  * Move    prmDummy	(Started bl460g1n7 -> bl460g1n6)
  * Move    prmVM2	(Started bl460g1n7 -> bl460g1n8)
  * Move    prmStonith8-1	(Started bl460g1n7 -> bl460g1n6)
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index 8ea3ff0..f70a9ea 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -18,7 +18,7 @@ Containers: [ pgsr01:prmDB1 ]
      Stopped: [ bl460g8n3 bl460g8n4 ]
 
 Transition Summary:
- * Fence pgsr02 (resource: prmDB2)
+ * Fence (off) pgsr02 (resource: prmDB2)
  * Stop    prmDB2	(bl460g8n4)
  * Restart prmStonith1-2	(Started bl460g8n4)
  * Restart prmStonith2-2	(Started bl460g8n3)
diff --git a/pengine/test10/bug-lf-2508.summary b/pengine/test10/bug-lf-2508.summary
index 7b436d4..7931d19 100644
--- a/pengine/test10/bug-lf-2508.summary
+++ b/pengine/test10/bug-lf-2508.summary
@@ -35,7 +35,7 @@ Online: [ srv01 srv03 srv04 ]
      Stopped: [ srv04 ]
 
 Transition Summary:
- * Fence srv02
+ * Fence (reboot) srv02
  * Start   Dummy01	(srv01)
  * Move    Dummy02	(Started srv02 -> srv04)
  * Stop    prmStonith1-1:1	(srv02)
diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary
index ffb7c6d..ef2e54a 100644
--- a/pengine/test10/bug-lf-2551.summary
+++ b/pengine/test10/bug-lf-2551.summary
@@ -81,7 +81,7 @@ Online: [ hex-0 hex-7 hex-8 ]
  vm-64	(ocf::heartbeat:Xen):	Stopped 
 
 Transition Summary:
- * Fence hex-9
+ * Fence (reboot) hex-9
  * Move    fencing-sbd	(Started hex-9 -> hex-0)
  * Move    dummy1	(Started hex-9 -> hex-0)
  * Stop    dlm:3	(hex-9)
diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary
index ab93bb3..f30a053 100644
--- a/pengine/test10/bug-lf-2606.summary
+++ b/pengine/test10/bug-lf-2606.summary
@@ -12,7 +12,7 @@ Online: [ node1 ]
      Slaves: [ node1 ]
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Stop    rsc1	(node2)
  * Move    rsc2	(Started node2 -> node1)
  * Demote  rsc3:1	(Master -> Stopped node2)
diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary
index 8fe474a..1c355c0 100644
--- a/pengine/test10/bug-rh-1097457.summary
+++ b/pengine/test10/bug-rh-1097457.summary
@@ -32,7 +32,7 @@ Containers: [ lamaVM1:VM1 lamaVM2:VM2 lamaVM3:VM3 ]
      Started: [ lamaVM1 lamaVM2 lamaVM3 ]
 
 Transition Summary:
- * Fence lamaVM2 (resource: VM2)
+ * Fence (reboot) lamaVM2 (resource: VM2)
  * Recover VM2	(Started lama3)
  * Recover FSlun3	(Started lamaVM2 -> lama2)
  * Restart FAKE4	(Started lamaVM2)
diff --git a/pengine/test10/concurrent-fencing.summary b/pengine/test10/concurrent-fencing.summary
index a274c3b..1e4a817 100644
--- a/pengine/test10/concurrent-fencing.summary
+++ b/pengine/test10/concurrent-fencing.summary
@@ -8,9 +8,9 @@ Node node3 (uuid3): UNCLEAN (offline)
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped
 
 Transition Summary:
- * Fence node3
- * Fence node2
- * Fence node1
+ * Fence (reboot) node3
+ * Fence (reboot) node2
+ * Fence (reboot) node1
 
 Executing cluster transition:
  * Fencing node3 (reboot)
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index 717c43d..9f85613 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -11,9 +11,9 @@ Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
      Stopped: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
 
 Transition Summary:
- * Fence rhel7-1
- * Fence lxc2 (resource: container2)
- * Fence lxc1 (resource: container1)
+ * Fence (reboot) rhel7-1
+ * Fence (reboot) lxc2 (resource: container2)
+ * Fence (reboot) lxc1 (resource: container1)
  * Restart Fencing	(Started rhel7-4)
  * Move    rsc_rhel7-1	(Started rhel7-1 -> rhel7-5)
  * Recover container1	(Started rhel7-1 -> rhel7-2)
diff --git a/pengine/test10/interleave-pseudo-stop.summary b/pengine/test10/interleave-pseudo-stop.summary
index cf30da0..12be956 100644
--- a/pengine/test10/interleave-pseudo-stop.summary
+++ b/pengine/test10/interleave-pseudo-stop.summary
@@ -17,7 +17,7 @@ Online: [ node2 ]
      Started: [ node2 ]
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Stop    stonithclone:1	(node1)
  * Stop    evmsclone:1	(node1)
  * Stop    imagestoreclone:1	(node1)
diff --git a/pengine/test10/master-7.summary b/pengine/test10/master-7.summary
index 348b4ee..2889efb 100644
--- a/pengine/test10/master-7.summary
+++ b/pengine/test10/master-7.summary
@@ -29,7 +29,7 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
 Transition Summary:
- * Fence c001n01
+ * Fence (reboot) c001n01
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
  * Move    ocf_192.168.100.181	(Started c001n03 -> c001n02)
  * Move    heartbeat_192.168.100.182	(Started c001n03 -> c001n02)
diff --git a/pengine/test10/master-8.summary b/pengine/test10/master-8.summary
index b77c884..5968a25 100644
--- a/pengine/test10/master-8.summary
+++ b/pengine/test10/master-8.summary
@@ -29,7 +29,7 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
 Transition Summary:
- * Fence c001n01
+ * Fence (reboot) c001n01
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
  * Move    ocf_192.168.100.181	(Started c001n03 -> c001n02)
  * Move    heartbeat_192.168.100.182	(Started c001n03 -> c001n02)
diff --git a/pengine/test10/migrate-fencing.summary b/pengine/test10/migrate-fencing.summary
index 831e49a..842c65d 100644
--- a/pengine/test10/migrate-fencing.summary
+++ b/pengine/test10/migrate-fencing.summary
@@ -22,7 +22,7 @@ Online: [ pcmk-1 pcmk-2 pcmk-3 ]
      Slaves: [ pcmk-1 pcmk-2 pcmk-3 ]
 
 Transition Summary:
- * Fence pcmk-4
+ * Fence (reboot) pcmk-4
  * Stop    FencingChild:0	(pcmk-4)
  * Move    r192.168.101.181	(Started pcmk-4 -> pcmk-1)
  * Move    r192.168.101.182	(Started pcmk-4 -> pcmk-1)
diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary
index eb967dd..22f5af7 100644
--- a/pengine/test10/rec-node-11.summary
+++ b/pengine/test10/rec-node-11.summary
@@ -10,7 +10,7 @@ Online: [ node2 ]
  rsc3	(heartbeat:apache):	Started node2
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
diff --git a/pengine/test10/rec-node-12.summary b/pengine/test10/rec-node-12.summary
index 26f9b13..6316fdb 100644
--- a/pengine/test10/rec-node-12.summary
+++ b/pengine/test10/rec-node-12.summary
@@ -15,7 +15,7 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:3	(stonith:ssh):	Stopped 
 
 Transition Summary:
- * Fence c001n02
+ * Fence (reboot) c001n02
  * Start   DcIPaddr	(c001n08)
  * Start   rsc_c001n08	(c001n08)
  * Start   rsc_c001n02	(c001n01)
diff --git a/pengine/test10/rec-node-13.summary b/pengine/test10/rec-node-13.summary
index e273a79..c222ad8 100644
--- a/pengine/test10/rec-node-13.summary
+++ b/pengine/test10/rec-node-13.summary
@@ -34,7 +34,7 @@ OFFLINE: [ c001n03 c001n05 ]
      ocf_msdummy:11	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n07 
 
 Transition Summary:
- * Fence c001n04
+ * Fence (reboot) c001n04
  * Stop    ocf_msdummy:6	(c001n04)
 
 Executing cluster transition:
diff --git a/pengine/test10/rec-node-14.summary b/pengine/test10/rec-node-14.summary
index 532f3d9..f503a92 100644
--- a/pengine/test10/rec-node-14.summary
+++ b/pengine/test10/rec-node-14.summary
@@ -8,9 +8,9 @@ Node node3 (uuid3): UNCLEAN (offline)
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped 
 
 Transition Summary:
- * Fence node3
- * Fence node2
- * Fence node1
+ * Fence (reboot) node3
+ * Fence (reboot) node2
+ * Fence (reboot) node1
 
 Executing cluster transition:
  * Fencing node1 (reboot)
diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary
index 8d88680..2f706d2 100644
--- a/pengine/test10/rec-node-15.summary
+++ b/pengine/test10/rec-node-15.summary
@@ -21,7 +21,7 @@ Online: [ sapcl01 ]
      oralsnr_25	(ocf::heartbeat:oralsnr):	Stopped 
 
 Transition Summary:
- * Fence sapcl03
+ * Fence (reboot) sapcl03
  * Start   stonith-1	(sapcl01)
  * Move    IPaddr_192_168_1_102	(Started sapcl02 -> sapcl01)
  * Move    LVM_12	(Started sapcl02 -> sapcl01)
diff --git a/pengine/test10/rec-node-2.summary b/pengine/test10/rec-node-2.summary
index 5c8db02..0e0183f 100644
--- a/pengine/test10/rec-node-2.summary
+++ b/pengine/test10/rec-node-2.summary
@@ -14,7 +14,7 @@ Online: [ node2 ]
      rsc6	(heartbeat:apache):	Stopped 
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Start   stonith-1	(node2)
  * Start   rsc1	(node2)
  * Start   rsc2	(node2)
diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary
index 761573f..0a2606e 100644
--- a/pengine/test10/rec-node-4.summary
+++ b/pengine/test10/rec-node-4.summary
@@ -8,7 +8,7 @@ Online: [ node2 ]
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary
index fb294fb..530c7d2 100644
--- a/pengine/test10/rec-node-6.summary
+++ b/pengine/test10/rec-node-6.summary
@@ -8,7 +8,7 @@ Online: [ node2 ]
  rsc2	(heartbeat:apache):	Started node1
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary
index 761573f..0a2606e 100644
--- a/pengine/test10/rec-node-7.summary
+++ b/pengine/test10/rec-node-7.summary
@@ -8,7 +8,7 @@ Online: [ node2 ]
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary
index 7bcb1a3..c3e658a 100644
--- a/pengine/test10/rec-rsc-5.summary
+++ b/pengine/test10/rec-rsc-5.summary
@@ -8,7 +8,7 @@ Online: [ node1 ]
  rsc2	(heartbeat:apache):	Started node2
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Start   stonith-1	(node1)
  * Recover rsc1	(Started node2 -> node1)
  * Move    rsc2	(Started node2 -> node1)
diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary
index 520f5cf..2ce3315 100644
--- a/pengine/test10/remote-fence-before-reconnect.summary
+++ b/pengine/test10/remote-fence-before-reconnect.summary
@@ -12,7 +12,7 @@ Online: [ c7auto1 c7auto2 c7auto3 ]
  fake5	(ocf::heartbeat:Dummy):	Started c7auto3
 
 Transition Summary:
- * Fence c7auto4
+ * Fence (reboot) c7auto4
  * Stop    c7auto4	(c7auto1)
  * Move    fake2	(Started c7auto4 -> c7auto1)
 
diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary
index ec24500..9296add 100644
--- a/pengine/test10/remote-fence-unclean-3.summary
+++ b/pengine/test10/remote-fence-unclean-3.summary
@@ -34,7 +34,7 @@ Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bund
    openstack-cinder-backup-docker-0	(ocf::heartbeat:docker):	Started overcloud-controller-1
 
 Transition Summary:
- * Fence overcloud-novacompute-0
+ * Fence (reboot) overcloud-novacompute-0
  * Start   fence1	(overcloud-controller-0)
  * Stop    overcloud-novacompute-0	(overcloud-controller-0)
 
diff --git a/pengine/test10/remote-fence-unclean.summary b/pengine/test10/remote-fence-unclean.summary
index 06940fc..667549b 100644
--- a/pengine/test10/remote-fence-unclean.summary
+++ b/pengine/test10/remote-fence-unclean.summary
@@ -11,7 +11,7 @@ Online: [ 18builder 18node1 18node2 ]
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1 
 
 Transition Summary:
- * Fence remote1
+ * Fence (reboot) remote1
  * Recover remote1	(Started 18node1)
  * Move    FAKE2	(Started remote1 -> 18builder)
  * Move    FAKE3	(Started 18builder -> 18node1)
diff --git a/pengine/test10/remote-fence-unclean2.summary b/pengine/test10/remote-fence-unclean2.summary
index 96f5d69..0844c29 100644
--- a/pengine/test10/remote-fence-unclean2.summary
+++ b/pengine/test10/remote-fence-unclean2.summary
@@ -10,7 +10,7 @@ OFFLINE: [ rhel7-alt3 ]
  fake	(ocf::heartbeat:Dummy):	Started rhel7-alt4 (UNCLEAN)
 
 Transition Summary:
- * Fence rhel7-alt4
+ * Fence (reboot) rhel7-alt4
  * Stop    fake	(rhel7-alt4)
 
 Executing cluster transition:
diff --git a/pengine/test10/remote-partial-migrate2.summary b/pengine/test10/remote-partial-migrate2.summary
index 197bd8c..b8b9b4c 100644
--- a/pengine/test10/remote-partial-migrate2.summary
+++ b/pengine/test10/remote-partial-migrate2.summary
@@ -63,7 +63,7 @@ RemoteOFFLINE: [ pcmk_remote4 ]
  FAKE50	(ocf::heartbeat:Dummy):	Started pcmk_remote5 
 
 Transition Summary:
- * Fence pcmk4
+ * Fence (reboot) pcmk4
  * Migrate pcmk_remote2	(Started pcmk3 -> pcmk1)
  * Start   pcmk_remote4	(pcmk2)
  * Migrate pcmk_remote5	(Started pcmk1 -> pcmk2)
diff --git a/pengine/test10/remote-recover-all.summary b/pengine/test10/remote-recover-all.summary
index 3f29f70..5e4f51d 100644
--- a/pengine/test10/remote-recover-all.summary
+++ b/pengine/test10/remote-recover-all.summary
@@ -38,9 +38,9 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	Started controller-1 (UNCLEAN)
 
 Transition Summary:
- * Fence messaging-1
- * Fence galera-2
- * Fence controller-1
+ * Fence (reboot) messaging-1
+ * Fence (reboot) galera-2
+ * Fence (reboot) controller-1
  * Stop    messaging-1	(controller-1)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Stop    galera-2	(controller-1)
diff --git a/pengine/test10/remote-recover-connection.summary b/pengine/test10/remote-recover-connection.summary
index 43507af..79ea7da 100644
--- a/pengine/test10/remote-recover-connection.summary
+++ b/pengine/test10/remote-recover-connection.summary
@@ -38,7 +38,7 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	Started controller-1 (UNCLEAN)
 
 Transition Summary:
- * Fence controller-1
+ * Fence (reboot) controller-1
  * Move    messaging-1	(Started controller-1 -> controller-2)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Move    galera-2	(Started controller-1 -> controller-2)
diff --git a/pengine/test10/remote-recover-fail.summary b/pengine/test10/remote-recover-fail.summary
index ec2d701..313c8ac 100644
--- a/pengine/test10/remote-recover-fail.summary
+++ b/pengine/test10/remote-recover-fail.summary
@@ -14,7 +14,7 @@ OFFLINE: [ rhel7-auto1 ]
  FAKE6	(ocf::heartbeat:Dummy):	Started rhel7-auto4 (UNCLEAN)
 
 Transition Summary:
- * Fence rhel7-auto4
+ * Fence (reboot) rhel7-auto4
  * Recover rhel7-auto4	(Started rhel7-auto2)
  * Start   FAKE1	(rhel7-auto2)
  * Move    FAKE2	(Started rhel7-auto4 -> rhel7-auto3)
diff --git a/pengine/test10/remote-recover-no-resources.summary b/pengine/test10/remote-recover-no-resources.summary
index 48355a4..bd27773 100644
--- a/pengine/test10/remote-recover-no-resources.summary
+++ b/pengine/test10/remote-recover-no-resources.summary
@@ -38,8 +38,8 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	Started controller-1 (UNCLEAN)
 
 Transition Summary:
- * Fence messaging-1
- * Fence controller-1
+ * Fence (reboot) messaging-1
+ * Fence (reboot) controller-1
  * Stop    messaging-1	(controller-1)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Stop    galera-2	(controller-1)
diff --git a/pengine/test10/remote-recover-unknown.summary b/pengine/test10/remote-recover-unknown.summary
index 212af4e..8a3d560 100644
--- a/pengine/test10/remote-recover-unknown.summary
+++ b/pengine/test10/remote-recover-unknown.summary
@@ -38,9 +38,9 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	Started controller-1 (UNCLEAN)
 
 Transition Summary:
- * Fence messaging-1
- * Fence galera-2
- * Fence controller-1
+ * Fence (reboot) messaging-1
+ * Fence (reboot) galera-2
+ * Fence (reboot) controller-1
  * Stop    messaging-1	(controller-1)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Stop    galera-2	(controller-1)
diff --git a/pengine/test10/remote-recovery.summary b/pengine/test10/remote-recovery.summary
index 43507af..79ea7da 100644
--- a/pengine/test10/remote-recovery.summary
+++ b/pengine/test10/remote-recovery.summary
@@ -38,7 +38,7 @@ RemoteOnline: [ galera-0 galera-1 galera-2 messaging-0 messaging-1 messaging-2 ]
  stonith-fence_ipmilan-5254005bdbb5	(stonith:fence_ipmilan):	Started controller-1 (UNCLEAN)
 
 Transition Summary:
- * Fence controller-1
+ * Fence (reboot) controller-1
  * Move    messaging-1	(Started controller-1 -> controller-2)
  * Move    galera-0	(Started controller-1 -> controller-2)
  * Move    galera-2	(Started controller-1 -> controller-2)
diff --git a/pengine/test10/remote-unclean2.summary b/pengine/test10/remote-unclean2.summary
index ad4af90..877eb4d 100644
--- a/pengine/test10/remote-unclean2.summary
+++ b/pengine/test10/remote-unclean2.summary
@@ -7,7 +7,7 @@ Online: [ rhel7-auto1 rhel7-auto2 rhel7-auto3 ]
  rhel7-auto4	(ocf::pacemaker:remote):	FAILED rhel7-auto1 
 
 Transition Summary:
- * Fence rhel7-auto4
+ * Fence (reboot) rhel7-auto4
  * Recover rhel7-auto4	(Started rhel7-auto1)
 
 Executing cluster transition:
diff --git a/pengine/test10/start-then-stop-with-unfence.summary b/pengine/test10/start-then-stop-with-unfence.summary
index 4430cc0..ae54afc 100644
--- a/pengine/test10/start-then-stop-with-unfence.summary
+++ b/pengine/test10/start-then-stop-with-unfence.summary
@@ -11,8 +11,7 @@ Online: [ rhel7-node1.example.com rhel7-node2.example.com ]
      Stopped: [ rhel7-node1.example.com ]
 
 Transition Summary:
- * Fence rhel7-node2.example.com
- * Fence rhel7-node1.example.com
+ * Fence (on) rhel7-node1.example.com
  * Start   mpath-node1	(rhel7-node1.example.com)
  * Move    ip1	(Started rhel7-node2.example.com -> rhel7-node1.example.com)
  * Start   jrummy:1	(rhel7-node1.example.com)
diff --git a/pengine/test10/stonith-0.summary b/pengine/test10/stonith-0.summary
index 24008a1..ee8ae15 100644
--- a/pengine/test10/stonith-0.summary
+++ b/pengine/test10/stonith-0.summary
@@ -37,8 +37,8 @@ Online: [ c001n02 c001n04 c001n06 c001n07 c001n08 ]
      ocf_msdummy:13	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n06 
 
 Transition Summary:
- * Fence c001n05
- * Fence c001n03
+ * Fence (reboot) c001n05
+ * Fence (reboot) c001n03
  * Move    ocf_192.168.100.181	(Started c001n03 -> c001n02)
  * Move    heartbeat_192.168.100.182	(Started c001n03 -> c001n02)
  * Recover ocf_192.168.100.183	(Started c001n03 -> c001n02)
diff --git a/pengine/test10/stonith-1.summary b/pengine/test10/stonith-1.summary
index 8556021..b68aca7 100644
--- a/pengine/test10/stonith-1.summary
+++ b/pengine/test10/stonith-1.summary
@@ -28,7 +28,7 @@ Online: [ sles-1 sles-2 sles-4 ]
      ocf_msdummy:7	(ocf::heartbeat:Stateful):	Stopped 
 
 Transition Summary:
- * Fence sles-3
+ * Fence (reboot) sles-3
  * Start   r192.168.100.183	(sles-1)
  * Move    migrator	(Started sles-3 -> sles-4)
  * Move    rsc_sles-3	(Started sles-3 -> sles-4)
diff --git a/pengine/test10/stonith-2.summary b/pengine/test10/stonith-2.summary
index 0f7cb99..eef35c4 100644
--- a/pengine/test10/stonith-2.summary
+++ b/pengine/test10/stonith-2.summary
@@ -33,7 +33,7 @@ Online: [ sles-1 sles-2 sles-3 sles-4 sles-6 ]
      ocf_msdummy:11	(ocf::heartbeat:Stateful):	Slave sles-3 
 
 Transition Summary:
- * Fence sles-5
+ * Fence (reboot) sles-5
  * Start   rsc_sles-5	(sles-6)
 
 Executing cluster transition:
diff --git a/pengine/test10/stonith-3.summary b/pengine/test10/stonith-3.summary
index cb25cc3..398b6bc 100644
--- a/pengine/test10/stonith-3.summary
+++ b/pengine/test10/stonith-3.summary
@@ -8,7 +8,7 @@ Online: [ rh5node2 ]
      Stopped: [ rh5node1 rh5node2 ]
 
 Transition Summary:
- * Fence rh5node1
+ * Fence (reboot) rh5node1
  * Start   prmIpPostgreSQLDB	(rh5node2)
  * Start   prmStonith:0	(rh5node2)
 
diff --git a/pengine/test10/stonith-4.summary b/pengine/test10/stonith-4.summary
index dc7cd89..6e3e396 100644
--- a/pengine/test10/stonith-4.summary
+++ b/pengine/test10/stonith-4.summary
@@ -14,10 +14,10 @@ OFFLINE: [ pcmk-4 pcmk-6 ]
  Fencing	(stonith:fence_xvm):	Stopped 
 
 Transition Summary:
- * Fence pcmk-8
- * Fence pcmk-7
- * Fence pcmk-5
- * Fence pcmk-10
+ * Fence (reboot) pcmk-8
+ * Fence (reboot) pcmk-7
+ * Fence (reboot) pcmk-5
+ * Fence (reboot) pcmk-10
  * Start   Fencing	(pcmk-1 - blocked)
 
 Executing cluster transition:
diff --git a/pengine/test10/stop-failure-no-quorum.summary b/pengine/test10/stop-failure-no-quorum.summary
index d864f1a..0248126 100644
--- a/pengine/test10/stop-failure-no-quorum.summary
+++ b/pengine/test10/stop-failure-no-quorum.summary
@@ -15,7 +15,7 @@ Online: [ pcmk-1 ]
  Fencing	(stonith:fence_xvm):	Stopped 
 
 Transition Summary:
- * Fence pcmk-2
+ * Fence (reboot) pcmk-2
  * Start   dlm:0	(pcmk-1 - blocked)
  * Stop    clvm:0	(pcmk-2)
  * Start   clvm:2	(pcmk-1 - blocked)
diff --git a/pengine/test10/stop-failure-with-fencing.summary b/pengine/test10/stop-failure-with-fencing.summary
index e01b6c4..e6c296b 100644
--- a/pengine/test10/stop-failure-with-fencing.summary
+++ b/pengine/test10/stop-failure-with-fencing.summary
@@ -14,7 +14,7 @@ Online: [ pcmk-1 ]
  Fencing	(stonith:fence_xvm):	Stopped 
 
 Transition Summary:
- * Fence pcmk-2
+ * Fence (reboot) pcmk-2
  * Start   dlm:0	(pcmk-1 - blocked)
  * Stop    clvm:0	(pcmk-2)
  * Start   clvm:1	(pcmk-1 - blocked)
diff --git a/pengine/test10/systemhealth1.summary b/pengine/test10/systemhealth1.summary
index 37b0b49..7301c6c 100644
--- a/pengine/test10/systemhealth1.summary
+++ b/pengine/test10/systemhealth1.summary
@@ -8,8 +8,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
- * Fence hs21c
+ * Fence (reboot) hs21d
+ * Fence (reboot) hs21c
 
 Executing cluster transition:
  * Fencing hs21d (reboot)
diff --git a/pengine/test10/systemhealth2.summary b/pengine/test10/systemhealth2.summary
index a37ce18..c83a7e2 100644
--- a/pengine/test10/systemhealth2.summary
+++ b/pengine/test10/systemhealth2.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
diff --git a/pengine/test10/systemhealth3.summary b/pengine/test10/systemhealth3.summary
index a37ce18..c83a7e2 100644
--- a/pengine/test10/systemhealth3.summary
+++ b/pengine/test10/systemhealth3.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
diff --git a/pengine/test10/systemhealthm1.summary b/pengine/test10/systemhealthm1.summary
index 37b0b49..7301c6c 100644
--- a/pengine/test10/systemhealthm1.summary
+++ b/pengine/test10/systemhealthm1.summary
@@ -8,8 +8,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
- * Fence hs21c
+ * Fence (reboot) hs21d
+ * Fence (reboot) hs21c
 
 Executing cluster transition:
  * Fencing hs21d (reboot)
diff --git a/pengine/test10/systemhealthm2.summary b/pengine/test10/systemhealthm2.summary
index a37ce18..c83a7e2 100644
--- a/pengine/test10/systemhealthm2.summary
+++ b/pengine/test10/systemhealthm2.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
diff --git a/pengine/test10/systemhealthm3.summary b/pengine/test10/systemhealthm3.summary
index b10d3f2..fbcdec5 100644
--- a/pengine/test10/systemhealthm3.summary
+++ b/pengine/test10/systemhealthm3.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
 
 Executing cluster transition:
  * Resource action: stonith-1       monitor on hs21c
diff --git a/pengine/test10/systemhealthn1.summary b/pengine/test10/systemhealthn1.summary
index 37b0b49..7301c6c 100644
--- a/pengine/test10/systemhealthn1.summary
+++ b/pengine/test10/systemhealthn1.summary
@@ -8,8 +8,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
- * Fence hs21c
+ * Fence (reboot) hs21d
+ * Fence (reboot) hs21c
 
 Executing cluster transition:
  * Fencing hs21d (reboot)
diff --git a/pengine/test10/systemhealthn2.summary b/pengine/test10/systemhealthn2.summary
index a37ce18..c83a7e2 100644
--- a/pengine/test10/systemhealthn2.summary
+++ b/pengine/test10/systemhealthn2.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
diff --git a/pengine/test10/systemhealthn3.summary b/pengine/test10/systemhealthn3.summary
index a37ce18..c83a7e2 100644
--- a/pengine/test10/systemhealthn3.summary
+++ b/pengine/test10/systemhealthn3.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
diff --git a/pengine/test10/systemhealtho1.summary b/pengine/test10/systemhealtho1.summary
index 37b0b49..7301c6c 100644
--- a/pengine/test10/systemhealtho1.summary
+++ b/pengine/test10/systemhealtho1.summary
@@ -8,8 +8,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
- * Fence hs21c
+ * Fence (reboot) hs21d
+ * Fence (reboot) hs21c
 
 Executing cluster transition:
  * Fencing hs21d (reboot)
diff --git a/pengine/test10/systemhealtho2.summary b/pengine/test10/systemhealtho2.summary
index b10d3f2..fbcdec5 100644
--- a/pengine/test10/systemhealtho2.summary
+++ b/pengine/test10/systemhealtho2.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
 
 Executing cluster transition:
  * Resource action: stonith-1       monitor on hs21c
diff --git a/pengine/test10/systemhealtho3.summary b/pengine/test10/systemhealtho3.summary
index b10d3f2..fbcdec5 100644
--- a/pengine/test10/systemhealtho3.summary
+++ b/pengine/test10/systemhealtho3.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
 
 Executing cluster transition:
  * Resource action: stonith-1       monitor on hs21c
diff --git a/pengine/test10/systemhealthp1.summary b/pengine/test10/systemhealthp1.summary
index 37b0b49..7301c6c 100644
--- a/pengine/test10/systemhealthp1.summary
+++ b/pengine/test10/systemhealthp1.summary
@@ -8,8 +8,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
- * Fence hs21c
+ * Fence (reboot) hs21d
+ * Fence (reboot) hs21c
 
 Executing cluster transition:
  * Fencing hs21d (reboot)
diff --git a/pengine/test10/systemhealthp2.summary b/pengine/test10/systemhealthp2.summary
index 6605e12..ea9465b 100644
--- a/pengine/test10/systemhealthp2.summary
+++ b/pengine/test10/systemhealthp2.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
  * Start   apache_1	(hs21c)
  * Start   nfs_1	(hs21c)
 
diff --git a/pengine/test10/systemhealthp3.summary b/pengine/test10/systemhealthp3.summary
index b10d3f2..fbcdec5 100644
--- a/pengine/test10/systemhealthp3.summary
+++ b/pengine/test10/systemhealthp3.summary
@@ -8,7 +8,7 @@ Online: [ hs21c ]
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
 Transition Summary:
- * Fence hs21d
+ * Fence (reboot) hs21d
 
 Executing cluster transition:
  * Resource action: stonith-1       monitor on hs21c
diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary
index 50df628..573f8c1 100644
--- a/pengine/test10/ticket-clone-21.summary
+++ b/pengine/test10/ticket-clone-21.summary
@@ -7,8 +7,8 @@ Online: [ node1 node2 ]
      Started: [ node1 node2 ]
 
 Transition Summary:
- * Fence node2
- * Fence node1
+ * Fence (reboot) node2
+ * Fence (reboot) node1
  * Stop    rsc_stonith	(node1)
  * Stop    rsc1:0	(node1)
  * Stop    rsc1:1	(node2)
diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary
index 50df628..573f8c1 100644
--- a/pengine/test10/ticket-clone-9.summary
+++ b/pengine/test10/ticket-clone-9.summary
@@ -7,8 +7,8 @@ Online: [ node1 node2 ]
      Started: [ node1 node2 ]
 
 Transition Summary:
- * Fence node2
- * Fence node1
+ * Fence (reboot) node2
+ * Fence (reboot) node1
  * Stop    rsc_stonith	(node1)
  * Stop    rsc1:0	(node1)
  * Stop    rsc1:1	(node2)
diff --git a/pengine/test10/ticket-group-21.summary b/pengine/test10/ticket-group-21.summary
index eab14a9..ff809ae 100644
--- a/pengine/test10/ticket-group-21.summary
+++ b/pengine/test10/ticket-group-21.summary
@@ -8,7 +8,7 @@ Online: [ node1 node2 ]
      rsc2	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Stop    rsc1	(node2)
  * Stop    rsc2	(node2)
 
diff --git a/pengine/test10/ticket-group-9.summary b/pengine/test10/ticket-group-9.summary
index eab14a9..ff809ae 100644
--- a/pengine/test10/ticket-group-9.summary
+++ b/pengine/test10/ticket-group-9.summary
@@ -8,7 +8,7 @@ Online: [ node1 node2 ]
      rsc2	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Stop    rsc1	(node2)
  * Stop    rsc2	(node2)
 
diff --git a/pengine/test10/ticket-master-21.summary b/pengine/test10/ticket-master-21.summary
index a107a38..c196c9d 100644
--- a/pengine/test10/ticket-master-21.summary
+++ b/pengine/test10/ticket-master-21.summary
@@ -8,7 +8,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Move    rsc_stonith	(Started node1 -> node2)
  * Demote  rsc1:0	(Master -> Stopped node1)
 
diff --git a/pengine/test10/ticket-master-9.summary b/pengine/test10/ticket-master-9.summary
index a107a38..c196c9d 100644
--- a/pengine/test10/ticket-master-9.summary
+++ b/pengine/test10/ticket-master-9.summary
@@ -8,7 +8,7 @@ Online: [ node1 node2 ]
      Slaves: [ node2 ]
 
 Transition Summary:
- * Fence node1
+ * Fence (reboot) node1
  * Move    rsc_stonith	(Started node1 -> node2)
  * Demote  rsc1:0	(Master -> Stopped node1)
 
diff --git a/pengine/test10/ticket-primitive-21.summary b/pengine/test10/ticket-primitive-21.summary
index 918b743..08a4860 100644
--- a/pengine/test10/ticket-primitive-21.summary
+++ b/pengine/test10/ticket-primitive-21.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Stop    rsc1	(node2)
 
 Executing cluster transition:
diff --git a/pengine/test10/ticket-primitive-9.summary b/pengine/test10/ticket-primitive-9.summary
index 918b743..08a4860 100644
--- a/pengine/test10/ticket-primitive-9.summary
+++ b/pengine/test10/ticket-primitive-9.summary
@@ -6,7 +6,7 @@ Online: [ node1 node2 ]
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
 Transition Summary:
- * Fence node2
+ * Fence (reboot) node2
  * Stop    rsc1	(node2)
 
 Executing cluster transition:
diff --git a/pengine/test10/unfence-definition.summary b/pengine/test10/unfence-definition.summary
index 03506a3..9477a02 100644
--- a/pengine/test10/unfence-definition.summary
+++ b/pengine/test10/unfence-definition.summary
@@ -12,11 +12,9 @@ Online: [ virt-1 virt-2 virt-3 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
 Transition Summary:
- * Fence virt-4
- * Fence virt-4
- * Fence virt-3
- * Fence virt-2
- * Fence virt-1
+ * Fence (reboot) virt-4
+ * Fence (on) virt-3
+ * Fence (on) virt-1
  * Restart fencing	(Started virt-1)
  * Restart dlm:0	(Started virt-1)
  * Start   dlm:2	(virt-3)
diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary
index 5cc4a4b..a713cd5 100644
--- a/pengine/test10/unfence-parameters.summary
+++ b/pengine/test10/unfence-parameters.summary
@@ -12,11 +12,10 @@ Online: [ virt-1 virt-2 virt-3 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
 Transition Summary:
- * Fence virt-4
- * Fence virt-4
- * Fence virt-3
- * Fence virt-2
- * Fence virt-1
+ * Fence (reboot) virt-4
+ * Fence (on) virt-3
+ * Fence (on) virt-2
+ * Fence (on) virt-1
  * Restart fencing	(Started virt-1)
  * Restart dlm:0	(Started virt-1)
  * Restart dlm:1	(Started virt-2)
diff --git a/pengine/test10/unfence-startup.summary b/pengine/test10/unfence-startup.summary
index 6cd38ad..c3f1be4 100644
--- a/pengine/test10/unfence-startup.summary
+++ b/pengine/test10/unfence-startup.summary
@@ -12,11 +12,8 @@ Online: [ virt-1 virt-2 virt-3 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
 Transition Summary:
- * Fence virt-4
- * Fence virt-4
- * Fence virt-3
- * Fence virt-2
- * Fence virt-1
+ * Fence (reboot) virt-4
+ * Fence (on) virt-3
  * Start   dlm:2	(virt-3)
  * Start   clvmd:1	(virt-2)
  * Start   clvmd:2	(virt-3)
diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary
index 5f70a66..57d72ba 100644
--- a/pengine/test10/whitebox-fail1.summary
+++ b/pengine/test10/whitebox-fail1.summary
@@ -14,7 +14,7 @@ Containers: [ lxc2:container2 ]
  D	(ocf::pacemaker:Dummy):	Started 18node1
 
 Transition Summary:
- * Fence lxc1 (resource: container1)
+ * Fence (reboot) lxc1 (resource: container1)
  * Recover container1	(Started 18node2)
  * Recover M:4	(Started lxc1)
  * Recover B	(Started lxc1)
diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary
index 2922f16..bf12683 100644
--- a/pengine/test10/whitebox-fail2.summary
+++ b/pengine/test10/whitebox-fail2.summary
@@ -14,7 +14,7 @@ Containers: [ lxc2:container2 ]
  D	(ocf::pacemaker:Dummy):	Started 18node1
 
 Transition Summary:
- * Fence lxc1 (resource: container1)
+ * Fence (reboot) lxc1 (resource: container1)
  * Recover container1	(Started 18node2)
  * Recover M:4	(Started lxc1)
  * Recover B	(Started lxc1)
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.summary b/pengine/test10/whitebox-imply-stop-on-fence.summary
index 31cc4a5..2fb20a6 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.summary
+++ b/pengine/test10/whitebox-imply-stop-on-fence.summary
@@ -25,9 +25,9 @@ Containers: [ lxc-01_kiff-02:R-lxc-01_kiff-02 lxc-02_kiff-02:R-lxc-02_kiff-02 ]
  vm-fs	(ocf::heartbeat:Filesystem):	FAILED lxc-01_kiff-01
 
 Transition Summary:
- * Fence lxc-02_kiff-01 (resource: R-lxc-02_kiff-01)
- * Fence lxc-01_kiff-01 (resource: R-lxc-01_kiff-01)
- * Fence kiff-01
+ * Fence (reboot) lxc-02_kiff-01 (resource: R-lxc-02_kiff-01)
+ * Fence (reboot) lxc-01_kiff-01 (resource: R-lxc-01_kiff-01)
+ * Fence (reboot) kiff-01
  * Move    fence-kiff-02	(Started kiff-01 -> kiff-02)
  * Stop    dlm:0	(kiff-01)
  * Stop    clvmd:0	(kiff-01)
diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
index fcdef66..2230d0f 100644
--- a/pengine/test10/whitebox-ms-ordering.summary
+++ b/pengine/test10/whitebox-ms-ordering.summary
@@ -9,8 +9,8 @@ Online: [ 18node1 18node2 18node3 ]
      Stopped: [ 18node1 18node2 18node3 ]
 
 Transition Summary:
- * Fence lxc2 (resource: container2)
- * Fence lxc1 (resource: container1)
+ * Fence (reboot) lxc2 (resource: container2)
+ * Fence (reboot) lxc1 (resource: container1)
  * Start   container1	(18node1)
  * Start   container2	(18node1)
  * Recover lxc-ms:0	(Master lxc1)
diff --git a/pengine/test10/whitebox-unexpectedly-running.summary b/pengine/test10/whitebox-unexpectedly-running.summary
index ed0a5bd..eabeb4d 100644
--- a/pengine/test10/whitebox-unexpectedly-running.summary
+++ b/pengine/test10/whitebox-unexpectedly-running.summary
@@ -5,7 +5,7 @@ Online: [ 18builder ]
  FAKE	(ocf::pacemaker:Dummy):	FAILED 18builder 
 
 Transition Summary:
- * Fence remote1 (resource: FAKE)
+ * Fence (reboot) remote1 (resource: FAKE)
  * Recover FAKE	(Started 18builder)
  * Start   remote1	(18builder)
 
-- 
1.8.3.1


From 7f8ba3076f180aae699df78609b0573e56a7c379 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Wed, 26 Jul 2017 10:34:48 +1000
Subject: [PATCH 02/12] Support unfencing of remote nodes

---
 crmd/te_callbacks.c                                |  21 +-
 include/crm/msg_xml.h                              |   1 +
 include/crm/pengine/internal.h                     |   2 +-
 lib/pengine/utils.c                                | 291 +++++++++++++++------
 pengine/allocate.c                                 |   4 +-
 pengine/native.c                                   |  39 ++-
 pengine/test10/594.scores                          |   1 +
 pengine/test10/594.summary                         |   1 +
 pengine/test10/829.scores                          |   1 +
 pengine/test10/829.summary                         |   1 +
 pengine/test10/bug-5186-partial-migrate.scores     |   1 +
 pengine/test10/bug-5186-partial-migrate.summary    |   1 +
 pengine/test10/bug-cl-5247.scores                  |   1 +
 pengine/test10/bug-cl-5247.summary                 |   1 +
 pengine/test10/bug-lf-2508.scores                  |   1 +
 pengine/test10/bug-lf-2508.summary                 |   1 +
 pengine/test10/bug-lf-2551.scores                  |   1 +
 pengine/test10/bug-lf-2551.summary                 |   1 +
 pengine/test10/bug-lf-2606.scores                  |   1 +
 pengine/test10/bug-lf-2606.summary                 |   1 +
 pengine/test10/bug-rh-1097457.scores               |   1 +
 pengine/test10/bug-rh-1097457.summary              |   1 +
 pengine/test10/concurrent-fencing.scores           |   3 +
 pengine/test10/concurrent-fencing.summary          |   3 +
 pengine/test10/guest-node-host-dies.scores         |   3 +
 pengine/test10/guest-node-host-dies.summary        |   3 +
 pengine/test10/interleave-pseudo-stop.scores       |   1 +
 pengine/test10/interleave-pseudo-stop.summary      |   1 +
 pengine/test10/master-7.scores                     |   1 +
 pengine/test10/master-7.summary                    |   1 +
 pengine/test10/master-8.scores                     |   1 +
 pengine/test10/master-8.summary                    |   1 +
 pengine/test10/migrate-fencing.scores              |   1 +
 pengine/test10/migrate-fencing.summary             |   1 +
 pengine/test10/rec-node-11.scores                  |   1 +
 pengine/test10/rec-node-11.summary                 |   1 +
 pengine/test10/rec-node-12.scores                  |   1 +
 pengine/test10/rec-node-12.summary                 |   1 +
 pengine/test10/rec-node-13.scores                  |   1 +
 pengine/test10/rec-node-13.summary                 |   1 +
 pengine/test10/rec-node-14.scores                  |   3 +
 pengine/test10/rec-node-14.summary                 |   3 +
 pengine/test10/rec-node-15.scores                  |   1 +
 pengine/test10/rec-node-15.summary                 |   1 +
 pengine/test10/rec-node-2.scores                   |   1 +
 pengine/test10/rec-node-2.summary                  |   1 +
 pengine/test10/rec-node-4.scores                   |   1 +
 pengine/test10/rec-node-4.summary                  |   1 +
 pengine/test10/rec-node-6.scores                   |   1 +
 pengine/test10/rec-node-6.summary                  |   1 +
 pengine/test10/rec-node-7.scores                   |   1 +
 pengine/test10/rec-node-7.summary                  |   1 +
 pengine/test10/rec-rsc-5.scores                    |   1 +
 pengine/test10/rec-rsc-5.summary                   |   1 +
 .../test10/remote-fence-before-reconnect.scores    |   1 +
 .../test10/remote-fence-before-reconnect.summary   |   1 +
 pengine/test10/remote-fence-unclean-3.scores       |   1 +
 pengine/test10/remote-fence-unclean-3.summary      |   1 +
 pengine/test10/remote-fence-unclean.scores         |   1 +
 pengine/test10/remote-fence-unclean.summary        |   1 +
 pengine/test10/remote-fence-unclean2.scores        |   1 +
 pengine/test10/remote-fence-unclean2.summary       |   1 +
 pengine/test10/remote-partial-migrate2.scores      |   1 +
 pengine/test10/remote-partial-migrate2.summary     |   1 +
 pengine/test10/remote-recover-all.scores           |   3 +
 pengine/test10/remote-recover-all.summary          |   3 +
 pengine/test10/remote-recover-connection.scores    |   1 +
 pengine/test10/remote-recover-connection.summary   |   1 +
 pengine/test10/remote-recover-fail.scores          |   1 +
 pengine/test10/remote-recover-fail.summary         |   1 +
 pengine/test10/remote-recover-no-resources.scores  |   2 +
 pengine/test10/remote-recover-no-resources.summary |   2 +
 pengine/test10/remote-recover-unknown.scores       |   3 +
 pengine/test10/remote-recover-unknown.summary      |   3 +
 pengine/test10/remote-recovery.scores              |   1 +
 pengine/test10/remote-recovery.summary             |   1 +
 pengine/test10/remote-unclean2.scores              |   1 +
 pengine/test10/remote-unclean2.summary             |   1 +
 pengine/test10/start-then-stop-with-unfence.dot    |   2 -
 pengine/test10/start-then-stop-with-unfence.exp    |  16 +-
 pengine/test10/start-then-stop-with-unfence.scores |   1 +
 .../test10/start-then-stop-with-unfence.summary    |   9 +-
 pengine/test10/start-then-stop-with-unfence.xml    |   1 +
 pengine/test10/stonith-0.scores                    |   2 +
 pengine/test10/stonith-0.summary                   |   2 +
 pengine/test10/stonith-1.scores                    |   1 +
 pengine/test10/stonith-1.summary                   |   1 +
 pengine/test10/stonith-2.scores                    |   1 +
 pengine/test10/stonith-2.summary                   |   1 +
 pengine/test10/stonith-3.scores                    |   1 +
 pengine/test10/stonith-3.summary                   |   1 +
 pengine/test10/stonith-4.scores                    |   4 +
 pengine/test10/stonith-4.summary                   |   4 +
 pengine/test10/stop-failure-no-quorum.scores       |   1 +
 pengine/test10/stop-failure-no-quorum.summary      |   1 +
 pengine/test10/stop-failure-with-fencing.scores    |   1 +
 pengine/test10/stop-failure-with-fencing.summary   |   1 +
 pengine/test10/systemhealth1.scores                |   2 +
 pengine/test10/systemhealth1.summary               |   2 +
 pengine/test10/systemhealth2.scores                |   1 +
 pengine/test10/systemhealth2.summary               |   1 +
 pengine/test10/systemhealth3.scores                |   1 +
 pengine/test10/systemhealth3.summary               |   1 +
 pengine/test10/systemhealthm1.scores               |   2 +
 pengine/test10/systemhealthm1.summary              |   2 +
 pengine/test10/systemhealthm2.scores               |   1 +
 pengine/test10/systemhealthm2.summary              |   1 +
 pengine/test10/systemhealthm3.scores               |   1 +
 pengine/test10/systemhealthm3.summary              |   1 +
 pengine/test10/systemhealthn1.scores               |   2 +
 pengine/test10/systemhealthn1.summary              |   2 +
 pengine/test10/systemhealthn2.scores               |   1 +
 pengine/test10/systemhealthn2.summary              |   1 +
 pengine/test10/systemhealthn3.scores               |   1 +
 pengine/test10/systemhealthn3.summary              |   1 +
 pengine/test10/systemhealtho1.scores               |   2 +
 pengine/test10/systemhealtho1.summary              |   2 +
 pengine/test10/systemhealtho2.scores               |   1 +
 pengine/test10/systemhealtho2.summary              |   1 +
 pengine/test10/systemhealtho3.scores               |   1 +
 pengine/test10/systemhealtho3.summary              |   1 +
 pengine/test10/systemhealthp1.scores               |   2 +
 pengine/test10/systemhealthp1.summary              |   2 +
 pengine/test10/systemhealthp2.scores               |   1 +
 pengine/test10/systemhealthp2.summary              |   1 +
 pengine/test10/systemhealthp3.scores               |   1 +
 pengine/test10/systemhealthp3.summary              |   1 +
 pengine/test10/ticket-clone-21.scores              |   2 +
 pengine/test10/ticket-clone-21.summary             |   2 +
 pengine/test10/ticket-clone-9.scores               |   2 +
 pengine/test10/ticket-clone-9.summary              |   2 +
 pengine/test10/ticket-group-21.scores              |   1 +
 pengine/test10/ticket-group-21.summary             |   1 +
 pengine/test10/ticket-group-9.scores               |   1 +
 pengine/test10/ticket-group-9.summary              |   1 +
 pengine/test10/ticket-master-21.scores             |   1 +
 pengine/test10/ticket-master-21.summary            |   1 +
 pengine/test10/ticket-master-9.scores              |   1 +
 pengine/test10/ticket-master-9.summary             |   1 +
 pengine/test10/ticket-primitive-21.scores          |   1 +
 pengine/test10/ticket-primitive-21.summary         |   1 +
 pengine/test10/ticket-primitive-9.scores           |   1 +
 pengine/test10/ticket-primitive-9.summary          |   1 +
 pengine/test10/unfence-definition.dot              |   5 +-
 pengine/test10/unfence-definition.exp              |  31 +--
 pengine/test10/unfence-definition.scores           |   3 +
 pengine/test10/unfence-definition.summary          |  13 +-
 pengine/test10/unfence-definition.xml              |  10 +
 pengine/test10/unfence-parameters.dot              |   7 +-
 pengine/test10/unfence-parameters.exp              |  42 ++-
 pengine/test10/unfence-parameters.scores           |   4 +
 pengine/test10/unfence-parameters.summary          |  14 +-
 pengine/test10/unfence-parameters.xml              |  10 +
 pengine/test10/unfence-startup.dot                 |   5 +-
 pengine/test10/unfence-startup.exp                 |  29 +-
 pengine/test10/unfence-startup.scores              |   2 +
 pengine/test10/unfence-startup.summary             |  10 +-
 pengine/test10/unfence-startup.xml                 |  10 +
 pengine/test10/whitebox-fail1.scores               |   1 +
 pengine/test10/whitebox-fail1.summary              |   1 +
 pengine/test10/whitebox-fail2.scores               |   1 +
 pengine/test10/whitebox-fail2.summary              |   1 +
 pengine/test10/whitebox-imply-stop-on-fence.scores |   3 +
 .../test10/whitebox-imply-stop-on-fence.summary    |   3 +
 pengine/test10/whitebox-ms-ordering.scores         |   2 +
 pengine/test10/whitebox-ms-ordering.summary        |   2 +
 .../test10/whitebox-unexpectedly-running.scores    |   1 +
 .../test10/whitebox-unexpectedly-running.summary   |   1 +
 168 files changed, 580 insertions(+), 194 deletions(-)

diff --git a/crmd/te_callbacks.c b/crmd/te_callbacks.c
index 3c63aa6..b5c857d 100644
--- a/crmd/te_callbacks.c
+++ b/crmd/te_callbacks.c
@@ -788,16 +788,31 @@ tengine_stonith_callback(stonith_t * stonith, stonith_callback_data_t * data)
     }
 
     stop_te_timer(action->timer);
-
     if (rc == pcmk_ok) {
         const char *target = crm_element_value(action->xml, XML_LRM_ATTR_TARGET);
         const char *uuid = crm_element_value(action->xml, XML_LRM_ATTR_TARGET_UUID);
         const char *op = crm_meta_value(action->params, "stonith_action"); 
 
-        crm_debug("Stonith operation %d for %s passed", call_id, target);
+        crm_info("Stonith operation %d for %s passed", call_id, target);
         if (action->confirmed == FALSE) {
             te_action_confirmed(action);
-            if (action->sent_update == FALSE && safe_str_neq("on", op)) {
+            if (safe_str_eq("on", op)) {
+                const char *key = NULL;
+                const char *value = NULL;
+
+                key = XML_NODE_IS_UNFENCED;
+                value = crm_meta_value(action->params, key);
+                update_attrd(target, key, value, NULL, FALSE);
+
+                key = "digests-all";
+                value = crm_meta_value(action->params, key);
+                update_attrd(target, key, value, NULL, FALSE);
+
+                key = "digests-secure";
+                value = crm_meta_value(action->params, key);
+                update_attrd(target, key, value, NULL, FALSE);
+
+            } else if (action->sent_update == FALSE) {
                 send_stonith_update(action, target, uuid);
                 action->sent_update = TRUE;
             }
diff --git a/include/crm/msg_xml.h b/include/crm/msg_xml.h
index a764e1d..8cf22f3 100644
--- a/include/crm/msg_xml.h
+++ b/include/crm/msg_xml.h
@@ -262,6 +262,7 @@
 #  define XML_NODE_IS_PEER    	"crmd"
 #  define XML_NODE_IS_REMOTE    	"remote_node"
 #  define XML_NODE_IS_FENCED		"node_fenced"
+#  define XML_NODE_IS_UNFENCED	    	"node_unfenced"
 #  define XML_NODE_IS_MAINTENANCE   "node_in_maintenance"
 
 #  define XML_CIB_ATTR_SHUTDOWN       	"shutdown"
diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
index 1b6afd1..3e10a30 100644
--- a/include/crm/pengine/internal.h
+++ b/include/crm/pengine/internal.h
@@ -273,7 +273,7 @@ typedef struct op_digest_cache_s {
 op_digest_cache_t *rsc_action_digest_cmp(resource_t * rsc, xmlNode * xml_op, node_t * node,
                                          pe_working_set_t * data_set);
 
-action_t *pe_fence_op(node_t * node, const char *op, bool optional, pe_working_set_t * data_set);
+action_t *pe_fence_op(node_t * node, const char *op, bool optional, const char *reason, pe_working_set_t * data_set);
 void trigger_unfencing(
     resource_t * rsc, node_t *node, const char *reason, action_t *dependency, pe_working_set_t * data_set);
 
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 7c29e7b..90da95a 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -1916,7 +1733,7 @@ filter_parameters(xmlNode * param_set, const char *param_string, bool need_prese
         return;
     }
 
-    if (param_set) {
+    if (param_set && param_string) {
         xmlAttrPtr xIter = param_set->properties;
 
         while (xIter) {
@@ -1982,104 +1814,162 @@ bool fix_remote_addr(resource_t * rsc)
     return TRUE;
 }
 
+static op_digest_cache_t *
+rsc_action_digest(resource_t * rsc, const char *task, const char *key,
+                  node_t * node, xmlNode * xml_op, pe_working_set_t * data_set) 
+{
+    op_digest_cache_t *data = NULL;
+
+    data = g_hash_table_lookup(node->details->digest_cache, key);
+    if (data == NULL) {
+        GHashTable *local_rsc_params = crm_str_table_new();
+        action_t *action = custom_action(rsc, strdup(key), task, node, TRUE, FALSE, data_set);
+        //xmlNode *local_versioned_params = create_xml_node(NULL, XML_TAG_RSC_VER_ATTRS);
+
+        const char *op_version;
+        //const char *ra_version = NULL;
+        const char *restart_list = NULL;
+        const char *secure_list = " passwd password ";
+
+        data = calloc(1, sizeof(op_digest_cache_t));
+        CRM_ASSERT(data != NULL);
+
+        get_rsc_attributes(local_rsc_params, rsc, node, data_set);
+        //pe_get_versioned_attributes(local_versioned_params, rsc, node, data_set);
+
+        data->params_all = create_xml_node(NULL, XML_TAG_PARAMS);
+        if (fix_remote_addr(rsc)) {
+            // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
+            crm_xml_add(data->params_all, "addr", node->details->uname);
+            crm_trace("Fixing addr for %s on %s", rsc->id, node->details->uname);
+        }
+
+        g_hash_table_foreach(local_rsc_params, hash2field, data->params_all);
+        g_hash_table_foreach(action->extra, hash2field, data->params_all);
+        g_hash_table_foreach(rsc->parameters, hash2field, data->params_all);
+        g_hash_table_foreach(action->meta, hash2metafield, data->params_all);
+
+        if(xml_op) {
+            secure_list = crm_element_value(xml_op, XML_LRM_ATTR_OP_SECURE);
+            restart_list = crm_element_value(xml_op, XML_LRM_ATTR_OP_RESTART);
+
+            op_version = crm_element_value(xml_op, XML_ATTR_CRM_VERSION);
+            //ra_version = crm_element_value(xml_op, XML_ATTR_RA_VERSION);
+
+        } else {
+            op_version = CRM_FEATURE_SET;
+        }
+
+        //append_versioned_params(local_versioned_params, ra_version, data->params_all);
+        //append_versioned_params(rsc->versioned_parameters, ra_version, data->params_all);
+        //append_versioned_params(action->versioned_parameters, ra_version, data->params_all);
+
+        filter_action_parameters(data->params_all, op_version);
+
+        g_hash_table_destroy(local_rsc_params);
+        pe_free_action(action);
+
+        data->digest_all_calc = calculate_operation_digest(data->params_all, op_version);
+
+        if (is_set(data_set->flags, pe_flag_sanitized)) {
+            data->params_secure = copy_xml(data->params_all);
+            if(secure_list) {
+                filter_parameters(data->params_secure, secure_list, FALSE);
+            }
+            data->digest_secure_calc = calculate_operation_digest(data->params_secure, op_version);
+        }
+
+        if(crm_element_value(xml_op, XML_LRM_ATTR_RESTART_DIGEST) != NULL) {
+            data->params_restart = copy_xml(data->params_all);
+            if (restart_list) {
+                filter_parameters(data->params_restart, restart_list, TRUE);
+            }
+            data->digest_restart_calc = calculate_operation_digest(data->params_restart, op_version);
+        }
+
+        g_hash_table_insert(node->details->digest_cache, strdup(key), data);
+    }
+
+    return data;
+}
+
 op_digest_cache_t *
 rsc_action_digest_cmp(resource_t * rsc, xmlNode * xml_op, node_t * node,
                       pe_working_set_t * data_set)
 {
     op_digest_cache_t *data = NULL;
 
-    GHashTable *local_rsc_params = NULL;
-
-    action_t *action = NULL;
     char *key = NULL;
-
     int interval = 0;
-    const char *op_id = ID(xml_op);
+
     const char *interval_s = crm_element_value(xml_op, XML_LRM_ATTR_INTERVAL);
     const char *task = crm_element_value(xml_op, XML_LRM_ATTR_TASK);
+
     const char *digest_all;
     const char *digest_restart;
-    const char *secure_list;
-    const char *restart_list;
-    const char *op_version;
 
     CRM_ASSERT(node != NULL);
 
-    data = g_hash_table_lookup(node->details->digest_cache, op_id);
-    if (data) {
-        return data;
-    }
-
-    data = calloc(1, sizeof(op_digest_cache_t));
-    CRM_ASSERT(data != NULL);
-
     digest_all = crm_element_value(xml_op, XML_LRM_ATTR_OP_DIGEST);
     digest_restart = crm_element_value(xml_op, XML_LRM_ATTR_RESTART_DIGEST);
 
-    secure_list = crm_element_value(xml_op, XML_LRM_ATTR_OP_SECURE);
-    restart_list = crm_element_value(xml_op, XML_LRM_ATTR_OP_RESTART);
-
-    op_version = crm_element_value(xml_op, XML_ATTR_CRM_VERSION);
-
-    /* key is freed in custom_action */
     interval = crm_parse_int(interval_s, "0");
     key = generate_op_key(rsc->id, task, interval);
-    action = custom_action(rsc, key, task, node, TRUE, FALSE, data_set);
-    key = NULL;
-
-    local_rsc_params = g_hash_table_new_full(crm_str_hash, g_str_equal,
-                                             g_hash_destroy_str, g_hash_destroy_str);
-    get_rsc_attributes(local_rsc_params, rsc, node, data_set);
-    data->params_all = create_xml_node(NULL, XML_TAG_PARAMS);
+    data = rsc_action_digest(rsc, task, key, node, xml_op, data_set);
 
-    if (fix_remote_addr(rsc)) {
-        // REMOTE_CONTAINER_HACK: Allow remote nodes that start containers with pacemaker remote inside
-        crm_xml_add(data->params_all, "addr", node->details->uname);
-        crm_trace("Fixing addr for %s on %s", rsc->id, node->details->uname);
-    }
+    data->rc = RSC_DIGEST_MATCH;
+    if (digest_restart && data->digest_restart_calc && strcmp(data->digest_restart_calc, digest_restart) != 0) {
+        data->rc = RSC_DIGEST_RESTART;
 
-    g_hash_table_foreach(local_rsc_params, hash2field, data->params_all);
-    g_hash_table_foreach(action->extra, hash2field, data->params_all);
-    g_hash_table_foreach(rsc->parameters, hash2field, data->params_all);
-    g_hash_table_foreach(action->meta, hash2metafield, data->params_all);
-    filter_action_parameters(data->params_all, op_version);
+    } else if (digest_all == NULL) {
+        /* it is unknown what the previous op digest was */
+        data->rc = RSC_DIGEST_UNKNOWN;
 
-    data->digest_all_calc = calculate_operation_digest(data->params_all, op_version);
+    } else if (strcmp(digest_all, data->digest_all_calc) != 0) {
+        data->rc = RSC_DIGEST_ALL;
+    }
 
-    if (secure_list && is_set(data_set->flags, pe_flag_sanitized)) {
-        data->params_secure = copy_xml(data->params_all);
+    free(key);
+    return data;
+}
 
-        if (secure_list) {
-            filter_parameters(data->params_secure, secure_list, FALSE);
-        }
-        data->digest_secure_calc = calculate_operation_digest(data->params_secure, op_version);
-    }
+#define STONITH_DIGEST_TASK "stonith-on"
 
-    if (digest_restart) {
-        data->params_restart = copy_xml(data->params_all);
+static op_digest_cache_t *
+fencing_action_digest_cmp(resource_t * rsc, node_t * node, pe_working_set_t * data_set)
+{
+    char *key = generate_op_key(rsc->id, STONITH_DIGEST_TASK, 0);
+    op_digest_cache_t *data = rsc_action_digest(rsc, STONITH_DIGEST_TASK, key, node, NULL, data_set);
 
-        if (restart_list) {
-            filter_parameters(data->params_restart, restart_list, TRUE);
-        }
-        data->digest_restart_calc = calculate_operation_digest(data->params_restart, op_version);
-    }
+    const char *digest_all = g_hash_table_lookup(node->details->attrs, "digests-all");
+    const char *digest_secure = g_hash_table_lookup(node->details->attrs, "digests-secure");
 
-    data->rc = RSC_DIGEST_MATCH;
-    if (digest_restart && strcmp(data->digest_restart_calc, digest_restart) != 0) {
-        data->rc = RSC_DIGEST_RESTART;
+    /* No restarts for fencing device changes */
 
-    } else if (digest_all == NULL) {
+    data->rc = RSC_DIGEST_ALL;
+    if (digest_all == NULL) {
         /* it is unknown what the previous op digest was */
         data->rc = RSC_DIGEST_UNKNOWN;
 
-    } else if (strcmp(digest_all, data->digest_all_calc) != 0) {
-        data->rc = RSC_DIGEST_ALL;
+    } else if (strcmp(digest_all, data->digest_all_calc) == 0) {
+        data->rc = RSC_DIGEST_MATCH;
+
+    } else if(digest_secure && data->digest_secure_calc) {
+        char *search = crm_strdup_printf("%s:%s:%s", rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
+
+        if(strstr(digest_secure, search)) {
+            fprintf(stdout, "Only 'private' parameters to %s for unfencing %s changed\n",
+                    rsc->id, node->details->uname);
+            data->rc = RSC_DIGEST_MATCH;
+        }
     }
 
-    g_hash_table_insert(node->details->digest_cache, strdup(op_id), data);
-    g_hash_table_destroy(local_rsc_params);
-    pe_free_action(action);
+    if (data->rc == RSC_DIGEST_ALL && is_set(data_set->flags, pe_flag_sanitized) && data->digest_secure_calc) {
+        fprintf(stdout, "Parameters to %s for unfencing %s changed, try '%s:%s:%s'\n",
+                rsc->id, node->details->uname, rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
+    }
 
+    free(key);
     return data;
 }
 
@@ -2117,35 +2007,113 @@ set_bit_recursive(resource_t * rsc, unsigned long long flag)
     }
 }
 
+static GListPtr
+find_unfencing_devices(GListPtr candidates, GListPtr matches) 
+{
+    for (GListPtr gIter = candidates; gIter != NULL; gIter = gIter->next) {
+        resource_t *candidate = gIter->data;
+        const char *provides = g_hash_table_lookup(candidate->meta, XML_RSC_ATTR_PROVIDES);
+        const char *requires = g_hash_table_lookup(candidate->meta, XML_RSC_ATTR_REQUIRES);
+
+        if(candidate->children) {
+            matches = find_unfencing_devices(candidate->children, matches);
+        } else if (is_not_set(candidate->flags, pe_rsc_fence_device)) {
+            continue;
+
+        } else if (crm_str_eq(provides, "unfencing", FALSE) || crm_str_eq(requires, "unfencing", FALSE)) {
+            matches = g_list_prepend(matches, candidate);
+        }
+    }
+    return matches;
+}
+
+
+#define STONITH_DIGEST_TASK "stonith-on"
+
 action_t *
-pe_fence_op(node_t * node, const char *op, bool optional, pe_working_set_t * data_set)
+pe_fence_op(node_t * node, const char *op, bool optional, const char *reason, pe_working_set_t * data_set)
 {
-    char *key = NULL;
+    char *op_key = NULL;
     action_t *stonith_op = NULL;
 
     if(op == NULL) {
         op = data_set->stonith_action;
     }
 
-    key = crm_strdup_printf("%s-%s-%s", CRM_OP_FENCE, node->details->uname, op);
+    op_key = crm_strdup_printf("%s-%s-%s", CRM_OP_FENCE, node->details->uname, op);
 
     if(data_set->singletons) {
-        stonith_op = g_hash_table_lookup(data_set->singletons, key);
+        stonith_op = g_hash_table_lookup(data_set->singletons, op_key);
     }
 
     if(stonith_op == NULL) {
-        stonith_op = custom_action(NULL, key, CRM_OP_FENCE, node, optional, TRUE, data_set);
+        stonith_op = custom_action(NULL, op_key, CRM_OP_FENCE, node, TRUE, TRUE, data_set);
 
         add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET, node->details->uname);
         add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET_UUID, node->details->id);
         add_hash_param(stonith_op->meta, "stonith_action", op);
+
+        if(is_remote_node(node) && is_set(data_set->flags, pe_flag_enable_unfencing)) {
+            /* Extra work to detect device changes on remotes
+             *
+             * We may do this for all nodes in the future, but for now
+             * the check_action_definition() based stuff works fine.
+             *
+             * Use "stonith-on" to avoid creating cache entries for
+             * operations check_action_definition() would look for.
+             */
+            long max = 1024;
+            long digests_all_offset = 0;
+            long digests_secure_offset = 0;
+
+            char *digests_all = malloc(max);
+            char *digests_secure = malloc(max);
+            GListPtr matches = find_unfencing_devices(data_set->resources, NULL);
+
+            for (GListPtr gIter = matches; gIter != NULL; gIter = gIter->next) {
+                resource_t *match = gIter->data;
+                op_digest_cache_t *data = fencing_action_digest_cmp(match, node, data_set);
+
+                if(data->rc == RSC_DIGEST_ALL) {
+                    optional = FALSE;
+                    crm_notice("Unfencing %s (remote): because the definition of %s changed", node->details->uname, match->id);
+                    if (is_set(data_set->flags, pe_flag_sanitized)) {
+                        /* Extra detail for those running from the commandline */
+                        fprintf(stdout, "  notice: Unfencing %s (remote): because the definition of %s changed\n", node->details->uname, match->id);
+                    }
+
+                }
+
+                digests_all_offset += snprintf(
+                    digests_all+digests_all_offset, max-digests_all_offset,
+                    "%s:%s:%s,", match->id, (const char*)g_hash_table_lookup(match->meta, XML_ATTR_TYPE), data->digest_all_calc);
+
+                digests_secure_offset += snprintf(
+                    digests_secure+digests_secure_offset, max-digests_secure_offset,
+                    "%s:%s:%s,", match->id, (const char*)g_hash_table_lookup(match->meta, XML_ATTR_TYPE), data->digest_secure_calc);
+            }
+            add_hash_param(stonith_op->meta, strdup("digests-all"), digests_all);
+            add_hash_param(stonith_op->meta, strdup("digests-secure"), digests_secure);
+        }
+
     } else {
-        free(key);
+        free(op_key);
     }
 
-    if(optional == FALSE) {
-        crm_trace("%s is no longer optional", stonith_op->uuid);
+    if(optional == FALSE && is_set(stonith_op->flags, pe_action_optional)) {
+        const char *kind = "Fencing  ";
+
         pe_clear_action_bit(stonith_op, pe_action_optional);
+
+        if(safe_str_eq(op, "on")) {
+            kind = "Unfencing";
+        }
+
+        crm_notice("%s %s: %s", kind, node->details->uname, reason);
+        if (is_set(data_set->flags, pe_flag_sanitized)) {
+            /* Extra detail for those running from the commandline */
+            fprintf(stdout, "  notice: %s %s: %s\n", kind, node->details->uname, reason);
+        }
     }
 
     return stonith_op;
@@ -2167,9 +2135,8 @@ trigger_unfencing(
               && node->details->online
               && node->details->unclean == FALSE
               && node->details->shutdown == FALSE) {
-        action_t *unfence = pe_fence_op(node, "on", FALSE, data_set);
+        action_t *unfence = pe_fence_op(node, "on", FALSE, reason, data_set);
 
-        crm_notice("Unfencing %s: %s", node->details->uname, reason);
         if(dependency) {
             order_actions(unfence, dependency, pe_order_optional);
         }
diff --git a/pengine/allocate.c b/pengine/allocate.c
index 8ea2ea1..fd9c4f9 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -1406,7 +1406,7 @@ fence_guest(pe_node_t *node, pe_action_t *done, pe_working_set_t *data_set)
     /* Create a fence pseudo-event, so we have an event to order actions
      * against, and crmd can always detect it.
      */
-    stonith_op = pe_fence_op(node, fence_action, FALSE, data_set);
+    stonith_op = pe_fence_op(node, fence_action, FALSE, "guest is unclean", data_set);
     update_action_flags(stonith_op, pe_action_pseudo | pe_action_runnable,
                         __FUNCTION__, __LINE__);
 
@@ -1488,7 +1488,7 @@ stage6(pe_working_set_t * data_set)
 
             pe_warn("Scheduling Node %s for STONITH", node->details->uname);
 
-            stonith_op = pe_fence_op(node, NULL, FALSE, data_set);
+            stonith_op = pe_fence_op(node, NULL, FALSE, "node is unclean", data_set);
 
             stonith_constraints(node, stonith_op, data_set);
 
diff --git a/pengine/native.c b/pengine/native.c
index dd5ff18..bc59405 100644
--- a/pengine/native.c
+++ b/pengine/native.c
@@ -1355,7 +1355,7 @@ native_internal_constraints(resource_t * rsc, pe_working_set_t * data_set)
 
         g_hash_table_iter_init(&iter, rsc->allowed_nodes);
         while (g_hash_table_iter_next(&iter, NULL, (void **)&node)) {
-            action_t *unfence = pe_fence_op(node, "on", TRUE, data_set);
+            action_t *unfence = pe_fence_op(node, "on", TRUE, __FUNCTION__, data_set);
 
             crm_debug("Ordering any stops of %s before %s, and any starts after",
                       rsc->id, unfence->uuid);
@@ -2455,6 +2455,16 @@ StopRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * d
         if (is_set(data_set->flags, pe_flag_remove_after_stop)) {
             DeleteRsc(rsc, current, optional, data_set);
         }
+
+        if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
+            action_t *unfence = pe_fence_op(current, "on", TRUE, __FUNCTION__, data_set);
+            const char *unfenced = g_hash_table_lookup(current->details->attrs, XML_NODE_IS_UNFENCED);
+
+            order_actions(stop, unfence, pe_order_implies_first);
+            if (unfenced == NULL || safe_str_eq("0", unfenced)) {
+                pe_proc_err("Stopping %s until %s can be unfenced", rsc->id, current->details->uname);
+            }
+        }
     }
 
     return TRUE;
@@ -2468,9 +2478,25 @@ StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t *
     CRM_ASSERT(rsc);
     pe_rsc_trace(rsc, "%s on %s %d", rsc->id, next ? next->details->uname : "N/A", optional);
     start = start_action(rsc, next, TRUE);
+
+    if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
+        action_t *unfence = pe_fence_op(next, "on", TRUE, __FUNCTION__, data_set);
+        const char *unfenced = g_hash_table_lookup(next->details->attrs, XML_NODE_IS_UNFENCED);
+
+        order_actions(unfence, start, pe_order_implies_then);
+
+        if (unfenced == NULL || safe_str_eq("0", unfenced)) {
+            char *reason = crm_strdup_printf("Required by %s", rsc->id);
+            trigger_unfencing(NULL, next, reason, NULL, data_set);
+            free(reason);
+        }
+    }
+
     if (is_set(start->flags, pe_action_runnable) && optional == FALSE) {
         update_action_flags(start, pe_action_optional | pe_action_clear, __FUNCTION__, __LINE__);
     }
+
+
     return TRUE;
 }
 
@@ -2820,14 +2846,9 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
      * probed, we know the state of all resources that require
      * unfencing and that unfencing occurred.
      */
-    if(is_set(rsc->flags, pe_rsc_fence_device) && is_set(data_set->flags, pe_flag_enable_unfencing)) {
-        trigger_unfencing(NULL, node, "node discovery", probe, data_set);
-        probe->priority = INFINITY; /* Ensure this runs if unfencing succeeds */
-
-    } else if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-        action_t *unfence = pe_fence_op(node, "on", TRUE, data_set);
-
-        order_actions(probe, unfence, pe_order_optional);
+    if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
+        action_t *unfence = pe_fence_op(node, "on", TRUE, __FUNCTION__, data_set);
+        order_actions(unfence, probe, pe_order_optional);
     }
 
     /*
diff --git a/pengine/test10/594.scores b/pengine/test10/594.scores
index 972b89b..430550c 100644
--- a/pengine/test10/594.scores
+++ b/pengine/test10/594.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hadev3: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on hadev1: 0
 clone_color: DoFencing allocation score on hadev2: 0
diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary
index ef2a02c..6cd78d3 100644
--- a/pengine/test10/594.summary
+++ b/pengine/test10/594.summary
@@ -12,6 +12,7 @@ Online: [ hadev1 hadev2 ]
      child_DoFencing:1	(stonith:ssh):	Started hadev1
      child_DoFencing:2	(stonith:ssh):	Started hadev1
 
+  notice: Fencing   hadev3: node is unclean
 Transition Summary:
  * Fence (reboot) hadev3
  * Shutdown hadev2
diff --git a/pengine/test10/829.scores b/pengine/test10/829.scores
index f0652ff..71a372b 100644
--- a/pengine/test10/829.scores
+++ b/pengine/test10/829.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c001n02: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/829.summary b/pengine/test10/829.summary
index 556699f..8649ed8 100644
--- a/pengine/test10/829.summary
+++ b/pengine/test10/829.summary
@@ -14,6 +14,7 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:2	(stonith:ssh):	Started c001n01
      child_DoFencing:3	(stonith:ssh):	Started c001n08
 
+  notice: Fencing   c001n02: node is unclean
 Transition Summary:
  * Fence (reboot) c001n02
  * Move    rsc_c001n02	(Started c001n02 -> c001n01)
diff --git a/pengine/test10/bug-5186-partial-migrate.scores b/pengine/test10/bug-5186-partial-migrate.scores
index 8b29529..dd59f34 100644
--- a/pengine/test10/bug-5186-partial-migrate.scores
+++ b/pengine/test10/bug-5186-partial-migrate.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   bl460g1n7: node is unclean
 Allocation scores:
 clone_color: clnDiskd1 allocation score on bl460g1n6: 200
 clone_color: clnDiskd1 allocation score on bl460g1n7: 0
diff --git a/pengine/test10/bug-5186-partial-migrate.summary b/pengine/test10/bug-5186-partial-migrate.summary
index a32e81d..5c8231d 100644
--- a/pengine/test10/bug-5186-partial-migrate.summary
+++ b/pengine/test10/bug-5186-partial-migrate.summary
@@ -24,6 +24,7 @@ Online: [ bl460g1n6 bl460g1n8 ]
      prmPing	(ocf::pacemaker:ping):	Started bl460g1n7 (UNCLEAN)
      Started: [ bl460g1n6 bl460g1n8 ]
 
+  notice: Fencing   bl460g1n7: node is unclean
 Transition Summary:
  * Fence (reboot) bl460g1n7
  * Move    prmDummy	(Started bl460g1n7 -> bl460g1n6)
diff --git a/pengine/test10/bug-cl-5247.scores b/pengine/test10/bug-cl-5247.scores
index e9e4709..f1ded69 100644
--- a/pengine/test10/bug-cl-5247.scores
+++ b/pengine/test10/bug-cl-5247.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   pgsr02: guest is unclean
 Allocation scores:
 Using the original execution date of: 2015-08-12 02:53:40Z
 clone_color: msPostgresql allocation score on bl460g8n3: -INFINITY
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index f70a9ea..755e647 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -17,6 +17,7 @@ Containers: [ pgsr01:prmDB1 ]
      Masters: [ pgsr01 ]
      Stopped: [ bl460g8n3 bl460g8n4 ]
 
+  notice: Fencing   pgsr02: guest is unclean
 Transition Summary:
  * Fence (off) pgsr02 (resource: prmDB2)
  * Stop    prmDB2	(bl460g8n4)
diff --git a/pengine/test10/bug-lf-2508.scores b/pengine/test10/bug-lf-2508.scores
index 3c3ce16..200d548 100644
--- a/pengine/test10/bug-lf-2508.scores
+++ b/pengine/test10/bug-lf-2508.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   srv02: node is unclean
 Allocation scores:
 clone_color: clnStonith1 allocation score on srv01: -INFINITY
 clone_color: clnStonith1 allocation score on srv02: 0
diff --git a/pengine/test10/bug-lf-2508.summary b/pengine/test10/bug-lf-2508.summary
index 7931d19..18080cb 100644
--- a/pengine/test10/bug-lf-2508.summary
+++ b/pengine/test10/bug-lf-2508.summary
@@ -34,6 +34,7 @@ Online: [ srv01 srv03 srv04 ]
      Started: [ srv01 srv03 ]
      Stopped: [ srv04 ]
 
+  notice: Fencing   srv02: node is unclean
 Transition Summary:
  * Fence (reboot) srv02
  * Start   Dummy01	(srv01)
diff --git a/pengine/test10/bug-lf-2551.scores b/pengine/test10/bug-lf-2551.scores
index 2b0aa12..64cbca0 100644
--- a/pengine/test10/bug-lf-2551.scores
+++ b/pengine/test10/bug-lf-2551.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hex-9: node is unclean
 Allocation scores:
 clone_color: base-clone allocation score on hex-0: 14
 clone_color: base-clone allocation score on hex-7: 16
diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary
index ef2e54a..4fa553c 100644
--- a/pengine/test10/bug-lf-2551.summary
+++ b/pengine/test10/bug-lf-2551.summary
@@ -80,6 +80,7 @@ Online: [ hex-0 hex-7 hex-8 ]
  vm-63	(ocf::heartbeat:Xen):	Stopped 
  vm-64	(ocf::heartbeat:Xen):	Stopped 
 
+  notice: Fencing   hex-9: node is unclean
 Transition Summary:
  * Fence (reboot) hex-9
  * Move    fencing-sbd	(Started hex-9 -> hex-0)
diff --git a/pengine/test10/bug-lf-2606.scores b/pengine/test10/bug-lf-2606.scores
index 6a9d522..b1e6a02 100644
--- a/pengine/test10/bug-lf-2606.scores
+++ b/pengine/test10/bug-lf-2606.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 clone_color: ms3 allocation score on node1: 0
 clone_color: ms3 allocation score on node2: 0
diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary
index f30a053..e6cfa89 100644
--- a/pengine/test10/bug-lf-2606.summary
+++ b/pengine/test10/bug-lf-2606.summary
@@ -11,6 +11,7 @@ Online: [ node1 ]
      Masters: [ node2 ]
      Slaves: [ node1 ]
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Stop    rsc1	(node2)
diff --git a/pengine/test10/bug-rh-1097457.scores b/pengine/test10/bug-rh-1097457.scores
index 7729421..2fe2859 100644
--- a/pengine/test10/bug-rh-1097457.scores
+++ b/pengine/test10/bug-rh-1097457.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   lamaVM2: guest is unclean
 Allocation scores:
 clone_color: FAKE6-clone allocation score on lama2: -INFINITY
 clone_color: FAKE6-clone allocation score on lama3: -INFINITY
diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary
index 1c355c0..19aa39d 100644
--- a/pengine/test10/bug-rh-1097457.summary
+++ b/pengine/test10/bug-rh-1097457.summary
@@ -31,6 +31,7 @@ Containers: [ lamaVM1:VM1 lamaVM2:VM2 lamaVM3:VM3 ]
  Clone Set: FAKE6-clone [FAKE6]
      Started: [ lamaVM1 lamaVM2 lamaVM3 ]
 
+  notice: Fencing   lamaVM2: guest is unclean
 Transition Summary:
  * Fence (reboot) lamaVM2 (resource: VM2)
  * Recover VM2	(Started lama3)
diff --git a/pengine/test10/concurrent-fencing.scores b/pengine/test10/concurrent-fencing.scores
index 0322231..1be723e 100644
--- a/pengine/test10/concurrent-fencing.scores
+++ b/pengine/test10/concurrent-fencing.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
+  notice: Fencing   node3: node is unclean
 Allocation scores:
 native_color: lsb_dummy allocation score on node1: 0
 native_color: lsb_dummy allocation score on node2: 0
diff --git a/pengine/test10/concurrent-fencing.summary b/pengine/test10/concurrent-fencing.summary
index 1e4a817..3f54c2c 100644
--- a/pengine/test10/concurrent-fencing.summary
+++ b/pengine/test10/concurrent-fencing.summary
@@ -7,6 +7,9 @@ Node node3 (uuid3): UNCLEAN (offline)
  stonith-1	(stonith:dummy):	Stopped
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped
 
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
+  notice: Fencing   node3: node is unclean
 Transition Summary:
  * Fence (reboot) node3
  * Fence (reboot) node2
diff --git a/pengine/test10/guest-node-host-dies.scores b/pengine/test10/guest-node-host-dies.scores
index 0d7ad3f..663d236 100644
--- a/pengine/test10/guest-node-host-dies.scores
+++ b/pengine/test10/guest-node-host-dies.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   lxc1: guest is unclean
+  notice: Fencing   lxc2: guest is unclean
+  notice: Fencing   rhel7-1: node is unclean
 Allocation scores:
 clone_color: lxc-ms-master allocation score on lxc1: INFINITY
 clone_color: lxc-ms-master allocation score on lxc2: INFINITY
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index 9f85613..679deb6 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -10,6 +10,9 @@ Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
  Master/Slave Set: lxc-ms-master [lxc-ms]
      Stopped: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
 
+  notice: Fencing   lxc1: guest is unclean
+  notice: Fencing   lxc2: guest is unclean
+  notice: Fencing   rhel7-1: node is unclean
 Transition Summary:
  * Fence (reboot) rhel7-1
  * Fence (reboot) lxc2 (resource: container2)
diff --git a/pengine/test10/interleave-pseudo-stop.scores b/pengine/test10/interleave-pseudo-stop.scores
index 014f4de..625ba18 100644
--- a/pengine/test10/interleave-pseudo-stop.scores
+++ b/pengine/test10/interleave-pseudo-stop.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 clone_color: configstoreclone:0 allocation score on node1: 0
 clone_color: configstoreclone:0 allocation score on node2: 1
diff --git a/pengine/test10/interleave-pseudo-stop.summary b/pengine/test10/interleave-pseudo-stop.summary
index 12be956..8c22b2f 100644
--- a/pengine/test10/interleave-pseudo-stop.summary
+++ b/pengine/test10/interleave-pseudo-stop.summary
@@ -16,6 +16,7 @@ Online: [ node2 ]
      configstoreclone	(ocf::heartbeat:Filesystem):	Started node1 (UNCLEAN)
      Started: [ node2 ]
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Stop    stonithclone:1	(node1)
diff --git a/pengine/test10/master-7.scores b/pengine/test10/master-7.scores
index 37fc6cd..7569625 100644
--- a/pengine/test10/master-7.scores
+++ b/pengine/test10/master-7.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c001n01: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/master-7.summary b/pengine/test10/master-7.summary
index 2889efb..d76051e 100644
--- a/pengine/test10/master-7.summary
+++ b/pengine/test10/master-7.summary
@@ -28,6 +28,7 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:6	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n02 
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
+  notice: Fencing   c001n01: node is unclean
 Transition Summary:
  * Fence (reboot) c001n01
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
diff --git a/pengine/test10/master-8.scores b/pengine/test10/master-8.scores
index c9d1cc9..880d7fb 100644
--- a/pengine/test10/master-8.scores
+++ b/pengine/test10/master-8.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c001n01: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/master-8.summary b/pengine/test10/master-8.summary
index 5968a25..7d0b840 100644
--- a/pengine/test10/master-8.summary
+++ b/pengine/test10/master-8.summary
@@ -28,6 +28,7 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:6	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n02 
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
+  notice: Fencing   c001n01: node is unclean
 Transition Summary:
  * Fence (reboot) c001n01
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
diff --git a/pengine/test10/migrate-fencing.scores b/pengine/test10/migrate-fencing.scores
index 3febd69..37d42b4 100644
--- a/pengine/test10/migrate-fencing.scores
+++ b/pengine/test10/migrate-fencing.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   pcmk-4: node is unclean
 Allocation scores:
 clone_color: Connectivity allocation score on pcmk-1: 0
 clone_color: Connectivity allocation score on pcmk-2: 0
diff --git a/pengine/test10/migrate-fencing.summary b/pengine/test10/migrate-fencing.summary
index 842c65d..fdb905e 100644
--- a/pengine/test10/migrate-fencing.summary
+++ b/pengine/test10/migrate-fencing.summary
@@ -21,6 +21,7 @@ Online: [ pcmk-1 pcmk-2 pcmk-3 ]
      Masters: [ pcmk-4 ]
      Slaves: [ pcmk-1 pcmk-2 pcmk-3 ]
 
+  notice: Fencing   pcmk-4: node is unclean
 Transition Summary:
  * Fence (reboot) pcmk-4
  * Stop    FencingChild:0	(pcmk-4)
diff --git a/pengine/test10/rec-node-11.scores b/pengine/test10/rec-node-11.scores
index 482deeb..86c2bf5 100644
--- a/pengine/test10/rec-node-11.scores
+++ b/pengine/test10/rec-node-11.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary
index 22f5af7..f45f0a8 100644
--- a/pengine/test10/rec-node-11.summary
+++ b/pengine/test10/rec-node-11.summary
@@ -9,6 +9,7 @@ Online: [ node2 ]
      rsc2	(heartbeat:apache):	Started node1
  rsc3	(heartbeat:apache):	Started node2
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Start   stonith-1	(node2)
diff --git a/pengine/test10/rec-node-12.scores b/pengine/test10/rec-node-12.scores
index 153c232..4fd9ff5 100644
--- a/pengine/test10/rec-node-12.scores
+++ b/pengine/test10/rec-node-12.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c001n02: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/rec-node-12.summary b/pengine/test10/rec-node-12.summary
index 6316fdb..562cae9 100644
--- a/pengine/test10/rec-node-12.summary
+++ b/pengine/test10/rec-node-12.summary
@@ -14,6 +14,7 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:2	(stonith:ssh):	Stopped 
      child_DoFencing:3	(stonith:ssh):	Stopped 
 
+  notice: Fencing   c001n02: node is unclean
 Transition Summary:
  * Fence (reboot) c001n02
  * Start   DcIPaddr	(c001n08)
diff --git a/pengine/test10/rec-node-13.scores b/pengine/test10/rec-node-13.scores
index dda1134..bdb5004 100644
--- a/pengine/test10/rec-node-13.scores
+++ b/pengine/test10/rec-node-13.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c001n04: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n02: 0
 clone_color: DoFencing allocation score on c001n03: 0
diff --git a/pengine/test10/rec-node-13.summary b/pengine/test10/rec-node-13.summary
index c222ad8..d3b4d65 100644
--- a/pengine/test10/rec-node-13.summary
+++ b/pengine/test10/rec-node-13.summary
@@ -33,6 +33,7 @@ OFFLINE: [ c001n03 c001n05 ]
      ocf_msdummy:10	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n06 
      ocf_msdummy:11	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n07 
 
+  notice: Fencing   c001n04: node is unclean
 Transition Summary:
  * Fence (reboot) c001n04
  * Stop    ocf_msdummy:6	(c001n04)
diff --git a/pengine/test10/rec-node-14.scores b/pengine/test10/rec-node-14.scores
index 0322231..1be723e 100644
--- a/pengine/test10/rec-node-14.scores
+++ b/pengine/test10/rec-node-14.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
+  notice: Fencing   node3: node is unclean
 Allocation scores:
 native_color: lsb_dummy allocation score on node1: 0
 native_color: lsb_dummy allocation score on node2: 0
diff --git a/pengine/test10/rec-node-14.summary b/pengine/test10/rec-node-14.summary
index f503a92..a707aee 100644
--- a/pengine/test10/rec-node-14.summary
+++ b/pengine/test10/rec-node-14.summary
@@ -7,6 +7,9 @@ Node node3 (uuid3): UNCLEAN (offline)
  stonith-1	(stonith:dummy):	Stopped 
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped 
 
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
+  notice: Fencing   node3: node is unclean
 Transition Summary:
  * Fence (reboot) node3
  * Fence (reboot) node2
diff --git a/pengine/test10/rec-node-15.scores b/pengine/test10/rec-node-15.scores
index 03dc6e6..d8b9617 100644
--- a/pengine/test10/rec-node-15.scores
+++ b/pengine/test10/rec-node-15.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   sapcl03: node is unclean
 Allocation scores:
 group_color: Filesystem_13 allocation score on sapcl01: 0
 group_color: Filesystem_13 allocation score on sapcl02: 0
diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary
index 2f706d2..863bfd4 100644
--- a/pengine/test10/rec-node-15.summary
+++ b/pengine/test10/rec-node-15.summary
@@ -20,6 +20,7 @@ Online: [ sapcl01 ]
      oracle_24	(ocf::heartbeat:oracle):	Stopped 
      oralsnr_25	(ocf::heartbeat:oralsnr):	Stopped 
 
+  notice: Fencing   sapcl03: node is unclean
 Transition Summary:
  * Fence (reboot) sapcl03
  * Start   stonith-1	(sapcl01)
diff --git a/pengine/test10/rec-node-2.scores b/pengine/test10/rec-node-2.scores
index 68e176f..6efa92d 100644
--- a/pengine/test10/rec-node-2.scores
+++ b/pengine/test10/rec-node-2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-2.summary b/pengine/test10/rec-node-2.summary
index 0e0183f..ecf6562 100644
--- a/pengine/test10/rec-node-2.summary
+++ b/pengine/test10/rec-node-2.summary
@@ -13,6 +13,7 @@ Online: [ node2 ]
      rsc5	(heartbeat:apache):	Stopped 
      rsc6	(heartbeat:apache):	Stopped 
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Start   stonith-1	(node2)
diff --git a/pengine/test10/rec-node-4.scores b/pengine/test10/rec-node-4.scores
index 1d008ec..e25a30f 100644
--- a/pengine/test10/rec-node-4.scores
+++ b/pengine/test10/rec-node-4.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary
index 0a2606e..f46a3bb 100644
--- a/pengine/test10/rec-node-4.summary
+++ b/pengine/test10/rec-node-4.summary
@@ -7,6 +7,7 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1 (UNCLEAN)
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Start   stonith-1	(node2)
diff --git a/pengine/test10/rec-node-6.scores b/pengine/test10/rec-node-6.scores
index 1d008ec..e25a30f 100644
--- a/pengine/test10/rec-node-6.scores
+++ b/pengine/test10/rec-node-6.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary
index 530c7d2..37257fe 100644
--- a/pengine/test10/rec-node-6.summary
+++ b/pengine/test10/rec-node-6.summary
@@ -7,6 +7,7 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1
  rsc2	(heartbeat:apache):	Started node1
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Start   stonith-1	(node2)
diff --git a/pengine/test10/rec-node-7.scores b/pengine/test10/rec-node-7.scores
index 1d008ec..e25a30f 100644
--- a/pengine/test10/rec-node-7.scores
+++ b/pengine/test10/rec-node-7.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary
index 0a2606e..f46a3bb 100644
--- a/pengine/test10/rec-node-7.summary
+++ b/pengine/test10/rec-node-7.summary
@@ -7,6 +7,7 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1 (UNCLEAN)
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Start   stonith-1	(node2)
diff --git a/pengine/test10/rec-rsc-5.scores b/pengine/test10/rec-rsc-5.scores
index 1c640ae..ebaedbd 100644
--- a/pengine/test10/rec-rsc-5.scores
+++ b/pengine/test10/rec-rsc-5.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: 0
 native_color: rsc1 allocation score on node2: -INFINITY
diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary
index c3e658a..6bc4010 100644
--- a/pengine/test10/rec-rsc-5.summary
+++ b/pengine/test10/rec-rsc-5.summary
@@ -7,6 +7,7 @@ Online: [ node1 ]
  rsc1	(heartbeat:apache):	FAILED node2 
  rsc2	(heartbeat:apache):	Started node2
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Start   stonith-1	(node1)
diff --git a/pengine/test10/remote-fence-before-reconnect.scores b/pengine/test10/remote-fence-before-reconnect.scores
index fb46919..9423693 100644
--- a/pengine/test10/remote-fence-before-reconnect.scores
+++ b/pengine/test10/remote-fence-before-reconnect.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   c7auto4: node is unclean
 Allocation scores:
 native_color: c7auto4 allocation score on c7auto1: -INFINITY
 native_color: c7auto4 allocation score on c7auto2: -INFINITY
diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary
index 2ce3315..f477884 100644
--- a/pengine/test10/remote-fence-before-reconnect.summary
+++ b/pengine/test10/remote-fence-before-reconnect.summary
@@ -11,6 +11,7 @@ Online: [ c7auto1 c7auto2 c7auto3 ]
  fake4	(ocf::heartbeat:Dummy):	Started c7auto2
  fake5	(ocf::heartbeat:Dummy):	Started c7auto3
 
+  notice: Fencing   c7auto4: node is unclean
 Transition Summary:
  * Fence (reboot) c7auto4
  * Stop    c7auto4	(c7auto1)
diff --git a/pengine/test10/remote-fence-unclean-3.scores b/pengine/test10/remote-fence-unclean-3.scores
index 77d71d6..283a599 100644
--- a/pengine/test10/remote-fence-unclean-3.scores
+++ b/pengine/test10/remote-fence-unclean-3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   overcloud-novacompute-0: node is unclean
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary
index 9296add..ec5d304 100644
--- a/pengine/test10/remote-fence-unclean-3.summary
+++ b/pengine/test10/remote-fence-unclean-3.summary
@@ -33,6 +33,7 @@ Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bund
  Docker container: openstack-cinder-backup [192.168.24.1:8787/tripleoupstream/centos-binary-cinder-backup:latest]
    openstack-cinder-backup-docker-0	(ocf::heartbeat:docker):	Started overcloud-controller-1
 
+  notice: Fencing   overcloud-novacompute-0: node is unclean
 Transition Summary:
  * Fence (reboot) overcloud-novacompute-0
  * Start   fence1	(overcloud-controller-0)
diff --git a/pengine/test10/remote-fence-unclean.scores b/pengine/test10/remote-fence-unclean.scores
index 8d29662..038ca2e 100644
--- a/pengine/test10/remote-fence-unclean.scores
+++ b/pengine/test10/remote-fence-unclean.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   remote1: node is unclean
 Allocation scores:
 native_color: FAKE1 allocation score on 18builder: 0
 native_color: FAKE1 allocation score on 18node1: 0
diff --git a/pengine/test10/remote-fence-unclean.summary b/pengine/test10/remote-fence-unclean.summary
index 667549b..8f37909 100644
--- a/pengine/test10/remote-fence-unclean.summary
+++ b/pengine/test10/remote-fence-unclean.summary
@@ -10,6 +10,7 @@ Online: [ 18builder 18node1 18node2 ]
  FAKE3	(ocf::heartbeat:Dummy):	Started 18builder 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1 
 
+  notice: Fencing   remote1: node is unclean
 Transition Summary:
  * Fence (reboot) remote1
  * Recover remote1	(Started 18node1)
diff --git a/pengine/test10/remote-fence-unclean2.scores b/pengine/test10/remote-fence-unclean2.scores
index 10fc7fd..937d0eb 100644
--- a/pengine/test10/remote-fence-unclean2.scores
+++ b/pengine/test10/remote-fence-unclean2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   rhel7-alt4: node is unclean
 Allocation scores:
 native_color: fake allocation score on rhel7-alt1: 0
 native_color: fake allocation score on rhel7-alt2: 0
diff --git a/pengine/test10/remote-fence-unclean2.summary b/pengine/test10/remote-fence-unclean2.summary
index 0844c29..060d55e 100644
--- a/pengine/test10/remote-fence-unclean2.summary
+++ b/pengine/test10/remote-fence-unclean2.summary
@@ -9,6 +9,7 @@ OFFLINE: [ rhel7-alt3 ]
  rhel7-alt4	(ocf::pacemaker:remote):	Stopped 
  fake	(ocf::heartbeat:Dummy):	Started rhel7-alt4 (UNCLEAN)
 
+  notice: Fencing   rhel7-alt4: node is unclean
 Transition Summary:
  * Fence (reboot) rhel7-alt4
  * Stop    fake	(rhel7-alt4)
diff --git a/pengine/test10/remote-partial-migrate2.scores b/pengine/test10/remote-partial-migrate2.scores
index 6965507..ce095b1 100644
--- a/pengine/test10/remote-partial-migrate2.scores
+++ b/pengine/test10/remote-partial-migrate2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   pcmk4: node is unclean
 Allocation scores:
 native_color: FAKE1 allocation score on pcmk1: -INFINITY
 native_color: FAKE1 allocation score on pcmk2: 0
diff --git a/pengine/test10/remote-partial-migrate2.summary b/pengine/test10/remote-partial-migrate2.summary
index b8b9b4c..c9f9592 100644
--- a/pengine/test10/remote-partial-migrate2.summary
+++ b/pengine/test10/remote-partial-migrate2.summary
@@ -62,6 +62,7 @@ RemoteOFFLINE: [ pcmk_remote4 ]
  FAKE49	(ocf::heartbeat:Dummy):	Started pcmk_remote3 
  FAKE50	(ocf::heartbeat:Dummy):	Started pcmk_remote5 
 
+  notice: Fencing   pcmk4: node is unclean
 Transition Summary:
  * Fence (reboot) pcmk4
  * Migrate pcmk_remote2	(Started pcmk3 -> pcmk1)
diff --git a/pengine/test10/remote-recover-all.scores b/pengine/test10/remote-recover-all.scores
index 43cac62..947f228 100644
--- a/pengine/test10/remote-recover-all.scores
+++ b/pengine/test10/remote-recover-all.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   galera-2: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Allocation scores:
 Using the original execution date of: 2017-05-03 13:33:24Z
 clone_color: galera-master allocation score on controller-0: -INFINITY
diff --git a/pengine/test10/remote-recover-all.summary b/pengine/test10/remote-recover-all.summary
index 5e4f51d..6868533 100644
--- a/pengine/test10/remote-recover-all.summary
+++ b/pengine/test10/remote-recover-all.summary
@@ -37,6 +37,9 @@ 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)
 
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   galera-2: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Transition Summary:
  * Fence (reboot) messaging-1
  * Fence (reboot) galera-2
diff --git a/pengine/test10/remote-recover-connection.scores b/pengine/test10/remote-recover-connection.scores
index 56a18eb..3d3beae 100644
--- a/pengine/test10/remote-recover-connection.scores
+++ b/pengine/test10/remote-recover-connection.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   controller-1: node is unclean
 Allocation scores:
 Using the original execution date of: 2017-05-03 13:33:24Z
 clone_color: galera-master allocation score on controller-0: -INFINITY
diff --git a/pengine/test10/remote-recover-connection.summary b/pengine/test10/remote-recover-connection.summary
index 79ea7da..f21b2b5 100644
--- a/pengine/test10/remote-recover-connection.summary
+++ b/pengine/test10/remote-recover-connection.summary
@@ -37,6 +37,7 @@ 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)
 
+  notice: Fencing   controller-1: node is unclean
 Transition Summary:
  * Fence (reboot) controller-1
  * Move    messaging-1	(Started controller-1 -> controller-2)
diff --git a/pengine/test10/remote-recover-fail.scores b/pengine/test10/remote-recover-fail.scores
index 8fc7805..02a0643 100644
--- a/pengine/test10/remote-recover-fail.scores
+++ b/pengine/test10/remote-recover-fail.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   rhel7-auto4: node is unclean
 Allocation scores:
 native_color: FAKE1 allocation score on rhel7-auto1: 0
 native_color: FAKE1 allocation score on rhel7-auto2: 0
diff --git a/pengine/test10/remote-recover-fail.summary b/pengine/test10/remote-recover-fail.summary
index 313c8ac..fd518eb 100644
--- a/pengine/test10/remote-recover-fail.summary
+++ b/pengine/test10/remote-recover-fail.summary
@@ -13,6 +13,7 @@ OFFLINE: [ rhel7-auto1 ]
  FAKE5	(ocf::heartbeat:Dummy):	Started rhel7-auto3 
  FAKE6	(ocf::heartbeat:Dummy):	Started rhel7-auto4 (UNCLEAN)
 
+  notice: Fencing   rhel7-auto4: node is unclean
 Transition Summary:
  * Fence (reboot) rhel7-auto4
  * Recover rhel7-auto4	(Started rhel7-auto2)
diff --git a/pengine/test10/remote-recover-no-resources.scores b/pengine/test10/remote-recover-no-resources.scores
index e918fc6..36a1ff4 100644
--- a/pengine/test10/remote-recover-no-resources.scores
+++ b/pengine/test10/remote-recover-no-resources.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Allocation scores:
 Using the original execution date of: 2017-05-03 13:33:24Z
 clone_color: galera-master allocation score on controller-0: -INFINITY
diff --git a/pengine/test10/remote-recover-no-resources.summary b/pengine/test10/remote-recover-no-resources.summary
index bd27773..c3cd6a8 100644
--- a/pengine/test10/remote-recover-no-resources.summary
+++ b/pengine/test10/remote-recover-no-resources.summary
@@ -37,6 +37,8 @@ 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)
 
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Transition Summary:
  * Fence (reboot) messaging-1
  * Fence (reboot) controller-1
diff --git a/pengine/test10/remote-recover-unknown.scores b/pengine/test10/remote-recover-unknown.scores
index e918fc6..d7d7713 100644
--- a/pengine/test10/remote-recover-unknown.scores
+++ b/pengine/test10/remote-recover-unknown.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   galera-2: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Allocation scores:
 Using the original execution date of: 2017-05-03 13:33:24Z
 clone_color: galera-master allocation score on controller-0: -INFINITY
diff --git a/pengine/test10/remote-recover-unknown.summary b/pengine/test10/remote-recover-unknown.summary
index 8a3d560..5b03065 100644
--- a/pengine/test10/remote-recover-unknown.summary
+++ b/pengine/test10/remote-recover-unknown.summary
@@ -37,6 +37,9 @@ 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)
 
+  notice: Fencing   controller-1: node is unclean
+  notice: Fencing   galera-2: node is unclean
+  notice: Fencing   messaging-1: node is unclean
 Transition Summary:
  * Fence (reboot) messaging-1
  * Fence (reboot) galera-2
diff --git a/pengine/test10/remote-recovery.scores b/pengine/test10/remote-recovery.scores
index 56a18eb..3d3beae 100644
--- a/pengine/test10/remote-recovery.scores
+++ b/pengine/test10/remote-recovery.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   controller-1: node is unclean
 Allocation scores:
 Using the original execution date of: 2017-05-03 13:33:24Z
 clone_color: galera-master allocation score on controller-0: -INFINITY
diff --git a/pengine/test10/remote-recovery.summary b/pengine/test10/remote-recovery.summary
index 79ea7da..f21b2b5 100644
--- a/pengine/test10/remote-recovery.summary
+++ b/pengine/test10/remote-recovery.summary
@@ -37,6 +37,7 @@ 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)
 
+  notice: Fencing   controller-1: node is unclean
 Transition Summary:
  * Fence (reboot) controller-1
  * Move    messaging-1	(Started controller-1 -> controller-2)
diff --git a/pengine/test10/remote-unclean2.scores b/pengine/test10/remote-unclean2.scores
index 72a5953..2c2c9a5 100644
--- a/pengine/test10/remote-unclean2.scores
+++ b/pengine/test10/remote-unclean2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   rhel7-auto4: node is unclean
 Allocation scores:
 native_color: rhel7-auto4 allocation score on rhel7-auto1: 0
 native_color: rhel7-auto4 allocation score on rhel7-auto2: 0
diff --git a/pengine/test10/remote-unclean2.summary b/pengine/test10/remote-unclean2.summary
index 877eb4d..06047d1 100644
--- a/pengine/test10/remote-unclean2.summary
+++ b/pengine/test10/remote-unclean2.summary
@@ -6,6 +6,7 @@ Online: [ rhel7-auto1 rhel7-auto2 rhel7-auto3 ]
  shooter	(stonith:fence_xvm):	Started rhel7-auto2 
  rhel7-auto4	(ocf::pacemaker:remote):	FAILED rhel7-auto1 
 
+  notice: Fencing   rhel7-auto4: node is unclean
 Transition Summary:
  * Fence (reboot) rhel7-auto4
  * Recover rhel7-auto4	(Started rhel7-auto1)
diff --git a/pengine/test10/start-then-stop-with-unfence.dot b/pengine/test10/start-then-stop-with-unfence.dot
index d8f7a71..6e9569b 100644
--- a/pengine/test10/start-then-stop-with-unfence.dot
+++ b/pengine/test10/start-then-stop-with-unfence.dot
@@ -23,7 +23,5 @@ digraph "g" {
 "mpath-node2_monitor_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"]
 "stonith 'on' rhel7-node1.example.com" -> "ip1_start_0 rhel7-node1.example.com" [ style = bold]
 "stonith 'on' rhel7-node1.example.com" -> "jrummy_start_0 rhel7-node1.example.com" [ style = bold]
-"stonith 'on' rhel7-node1.example.com" -> "mpath-node1_monitor_0 rhel7-node1.example.com" [ style = bold]
-"stonith 'on' rhel7-node1.example.com" -> "mpath-node2_monitor_0 rhel7-node1.example.com" [ style = bold]
 "stonith 'on' rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/start-then-stop-with-unfence.exp b/pengine/test10/start-then-stop-with-unfence.exp
index 359f25b..75cb356 100644
--- a/pengine/test10/start-then-stop-with-unfence.exp
+++ b/pengine/test10/start-then-stop-with-unfence.exp
@@ -1,16 +1,12 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
-  <synapse id="0" priority="1000000">
+  <synapse id="0">
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="mpath-node2_monitor_0" on_node="rhel7-node1.example.com" on_node_uuid="1">
         <primitive id="mpath-node2" class="stonith" type="fence_mpath"/>
         <attributes CRM_meta_on_node="rhel7-node1.example.com" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  devices="/dev/mapper/clustPVa" key="1234" pcmk_host_list="rhel7-node2.example.com"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="6" operation="stonith" operation_key="stonith-rhel7-node1.example.com-on" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
@@ -38,18 +34,14 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3" priority="1000000">
+  <synapse id="3">
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="mpath-node1_monitor_0" on_node="rhel7-node1.example.com" on_node_uuid="1">
         <primitive id="mpath-node1" class="stonith" type="fence_mpath"/>
         <attributes CRM_meta_on_node="rhel7-node1.example.com" CRM_meta_on_node_uuid="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  devices="/dev/mapper/clustPVa" key="1233" pcmk_host_list="rhel7-node1.example.com"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="6" operation="stonith" operation_key="stonith-rhel7-node1.example.com-on" on_node="rhel7-node1.example.com" on_node_uuid="1"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
diff --git a/pengine/test10/start-then-stop-with-unfence.scores b/pengine/test10/start-then-stop-with-unfence.scores
index d353bef..a53e9f2 100644
--- a/pengine/test10/start-then-stop-with-unfence.scores
+++ b/pengine/test10/start-then-stop-with-unfence.scores
@@ -1,3 +1,4 @@
+  notice: Unfencing rhel7-node1.example.com: Required by ip1
 Allocation scores:
 clone_color: jrummy-clone allocation score on rhel7-node1.example.com: 500
 clone_color: jrummy-clone allocation score on rhel7-node2.example.com: 500
diff --git a/pengine/test10/start-then-stop-with-unfence.summary b/pengine/test10/start-then-stop-with-unfence.summary
index ae54afc..bb376f5 100644
--- a/pengine/test10/start-then-stop-with-unfence.summary
+++ b/pengine/test10/start-then-stop-with-unfence.summary
@@ -10,6 +10,7 @@ Online: [ rhel7-node1.example.com rhel7-node2.example.com ]
      Started: [ rhel7-node2.example.com ]
      Stopped: [ rhel7-node1.example.com ]
 
+  notice: Unfencing rhel7-node1.example.com: Required by ip1
 Transition Summary:
  * Fence (on) rhel7-node1.example.com
  * Start   mpath-node1	(rhel7-node1.example.com)
@@ -17,17 +18,17 @@ Transition Summary:
  * Start   jrummy:1	(rhel7-node1.example.com)
 
 Executing cluster transition:
- * Pseudo action:   jrummy-clone_start_0
- * Fencing rhel7-node1.example.com (on)
  * Resource action: mpath-node2     monitor on rhel7-node1.example.com
  * Resource action: mpath-node1     monitor on rhel7-node1.example.com
+ * Pseudo action:   jrummy-clone_start_0
+ * Fencing rhel7-node1.example.com (on)
+ * Resource action: mpath-node1     start on rhel7-node1.example.com
  * Resource action: jrummy          start on rhel7-node1.example.com
  * Pseudo action:   jrummy-clone_running_0
- * Resource action: mpath-node1     start on rhel7-node1.example.com
+ * Resource action: mpath-node1     monitor=60000 on rhel7-node1.example.com
  * Resource action: ip1             stop on rhel7-node2.example.com
  * Resource action: jrummy          monitor=10000 on rhel7-node1.example.com
  * Pseudo action:   all_stopped
- * Resource action: mpath-node1     monitor=60000 on rhel7-node1.example.com
  * Resource action: ip1             start on rhel7-node1.example.com
  * Resource action: ip1             monitor=10000 on rhel7-node1.example.com
 
diff --git a/pengine/test10/start-then-stop-with-unfence.xml b/pengine/test10/start-then-stop-with-unfence.xml
index 499022e..b856250 100644
--- a/pengine/test10/start-then-stop-with-unfence.xml
+++ b/pengine/test10/start-then-stop-with-unfence.xml
@@ -95,6 +95,7 @@
         <instance_attributes id="status-2">
           <nvpair id="status-2-shutdown" name="shutdown" value="0"/>
           <nvpair id="status-2-probe_complete" name="probe_complete" value="true"/>
+	  <nvpair id="status-2-unfenced" name="node_unfenced" value="1234567"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="2">
diff --git a/pengine/test10/stonith-0.scores b/pengine/test10/stonith-0.scores
index 7aab8cd..db3ddb9 100644
--- a/pengine/test10/stonith-0.scores
+++ b/pengine/test10/stonith-0.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   c001n03: node is unclean
+  notice: Fencing   c001n05: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n02: 0
 clone_color: DoFencing allocation score on c001n03: 0
diff --git a/pengine/test10/stonith-0.summary b/pengine/test10/stonith-0.summary
index ee8ae15..6983a90 100644
--- a/pengine/test10/stonith-0.summary
+++ b/pengine/test10/stonith-0.summary
@@ -36,6 +36,8 @@ Online: [ c001n02 c001n04 c001n06 c001n07 c001n08 ]
      ocf_msdummy:12	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n06 
      ocf_msdummy:13	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n06 
 
+  notice: Fencing   c001n03: node is unclean
+  notice: Fencing   c001n05: node is unclean
 Transition Summary:
  * Fence (reboot) c001n05
  * Fence (reboot) c001n03
diff --git a/pengine/test10/stonith-1.scores b/pengine/test10/stonith-1.scores
index 7422355..196b9f5 100644
--- a/pengine/test10/stonith-1.scores
+++ b/pengine/test10/stonith-1.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   sles-3: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on sles-1: 0
 clone_color: DoFencing allocation score on sles-2: 0
diff --git a/pengine/test10/stonith-1.summary b/pengine/test10/stonith-1.summary
index b68aca7..111bcbe 100644
--- a/pengine/test10/stonith-1.summary
+++ b/pengine/test10/stonith-1.summary
@@ -27,6 +27,7 @@ Online: [ sles-1 sles-2 sles-4 ]
      ocf_msdummy:6	(ocf::heartbeat:Stateful):	Stopped 
      ocf_msdummy:7	(ocf::heartbeat:Stateful):	Stopped 
 
+  notice: Fencing   sles-3: node is unclean
 Transition Summary:
  * Fence (reboot) sles-3
  * Start   r192.168.100.183	(sles-1)
diff --git a/pengine/test10/stonith-2.scores b/pengine/test10/stonith-2.scores
index e1dd011..8c11561 100644
--- a/pengine/test10/stonith-2.scores
+++ b/pengine/test10/stonith-2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   sles-5: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on sles-1: 0
 clone_color: DoFencing allocation score on sles-2: 0
diff --git a/pengine/test10/stonith-2.summary b/pengine/test10/stonith-2.summary
index eef35c4..c8e1d70 100644
--- a/pengine/test10/stonith-2.summary
+++ b/pengine/test10/stonith-2.summary
@@ -32,6 +32,7 @@ Online: [ sles-1 sles-2 sles-3 sles-4 sles-6 ]
      ocf_msdummy:10	(ocf::heartbeat:Stateful):	Slave sles-2 
      ocf_msdummy:11	(ocf::heartbeat:Stateful):	Slave sles-3 
 
+  notice: Fencing   sles-5: node is unclean
 Transition Summary:
  * Fence (reboot) sles-5
  * Start   rsc_sles-5	(sles-6)
diff --git a/pengine/test10/stonith-3.scores b/pengine/test10/stonith-3.scores
index a1bd3d9..eef30fc 100644
--- a/pengine/test10/stonith-3.scores
+++ b/pengine/test10/stonith-3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   rh5node1: node is unclean
 Allocation scores:
 clone_color: clnStonith allocation score on rh5node1: 0
 clone_color: clnStonith allocation score on rh5node2: 0
diff --git a/pengine/test10/stonith-3.summary b/pengine/test10/stonith-3.summary
index 398b6bc..015dd77 100644
--- a/pengine/test10/stonith-3.summary
+++ b/pengine/test10/stonith-3.summary
@@ -7,6 +7,7 @@ Online: [ rh5node2 ]
  Clone Set: clnStonith [grpStonith]
      Stopped: [ rh5node1 rh5node2 ]
 
+  notice: Fencing   rh5node1: node is unclean
 Transition Summary:
  * Fence (reboot) rh5node1
  * Start   prmIpPostgreSQLDB	(rh5node2)
diff --git a/pengine/test10/stonith-4.scores b/pengine/test10/stonith-4.scores
index ac6fe0b..0bf1cf5 100644
--- a/pengine/test10/stonith-4.scores
+++ b/pengine/test10/stonith-4.scores
@@ -1,3 +1,7 @@
+  notice: Fencing   pcmk-10: node is unclean
+  notice: Fencing   pcmk-5: node is unclean
+  notice: Fencing   pcmk-7: node is unclean
+  notice: Fencing   pcmk-8: node is unclean
 Allocation scores:
 native_color: Fencing allocation score on pcmk-10: 0
 native_color: Fencing allocation score on pcmk-11: 0
diff --git a/pengine/test10/stonith-4.summary b/pengine/test10/stonith-4.summary
index 6e3e396..0c9b5bd 100644
--- a/pengine/test10/stonith-4.summary
+++ b/pengine/test10/stonith-4.summary
@@ -13,6 +13,10 @@ OFFLINE: [ pcmk-4 pcmk-6 ]
 
  Fencing	(stonith:fence_xvm):	Stopped 
 
+  notice: Fencing   pcmk-10: node is unclean
+  notice: Fencing   pcmk-5: node is unclean
+  notice: Fencing   pcmk-7: node is unclean
+  notice: Fencing   pcmk-8: node is unclean
 Transition Summary:
  * Fence (reboot) pcmk-8
  * Fence (reboot) pcmk-7
diff --git a/pengine/test10/stop-failure-no-quorum.scores b/pengine/test10/stop-failure-no-quorum.scores
index df30423..c1893b6 100644
--- a/pengine/test10/stop-failure-no-quorum.scores
+++ b/pengine/test10/stop-failure-no-quorum.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   pcmk-2: node is unclean
 Allocation scores:
 clone_color: clvm-clone allocation score on pcmk-1: 0
 clone_color: clvm-clone allocation score on pcmk-2: -INFINITY
diff --git a/pengine/test10/stop-failure-no-quorum.summary b/pengine/test10/stop-failure-no-quorum.summary
index 0248126..d91edc1 100644
--- a/pengine/test10/stop-failure-no-quorum.summary
+++ b/pengine/test10/stop-failure-no-quorum.summary
@@ -14,6 +14,7 @@ Online: [ pcmk-1 ]
  ClusterIP	(ocf::heartbeat:IPaddr2):	Stopped 
  Fencing	(stonith:fence_xvm):	Stopped 
 
+  notice: Fencing   pcmk-2: node is unclean
 Transition Summary:
  * Fence (reboot) pcmk-2
  * Start   dlm:0	(pcmk-1 - blocked)
diff --git a/pengine/test10/stop-failure-with-fencing.scores b/pengine/test10/stop-failure-with-fencing.scores
index cf62806..0dc0813 100644
--- a/pengine/test10/stop-failure-with-fencing.scores
+++ b/pengine/test10/stop-failure-with-fencing.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   pcmk-2: node is unclean
 Allocation scores:
 clone_color: clvm-clone allocation score on pcmk-1: 0
 clone_color: clvm-clone allocation score on pcmk-2: -INFINITY
diff --git a/pengine/test10/stop-failure-with-fencing.summary b/pengine/test10/stop-failure-with-fencing.summary
index e6c296b..79e6105 100644
--- a/pengine/test10/stop-failure-with-fencing.summary
+++ b/pengine/test10/stop-failure-with-fencing.summary
@@ -13,6 +13,7 @@ Online: [ pcmk-1 ]
  ClusterIP	(ocf::heartbeat:IPaddr2):	Stopped 
  Fencing	(stonith:fence_xvm):	Stopped 
 
+  notice: Fencing   pcmk-2: node is unclean
 Transition Summary:
  * Fence (reboot) pcmk-2
  * Start   dlm:0	(pcmk-1 - blocked)
diff --git a/pengine/test10/systemhealth1.scores b/pengine/test10/systemhealth1.scores
index 8a59654..c55f6e2 100644
--- a/pengine/test10/systemhealth1.scores
+++ b/pengine/test10/systemhealth1.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealth1.summary b/pengine/test10/systemhealth1.summary
index 7301c6c..335b94a 100644
--- a/pengine/test10/systemhealth1.summary
+++ b/pengine/test10/systemhealth1.summary
@@ -7,6 +7,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Fence (reboot) hs21c
diff --git a/pengine/test10/systemhealth2.scores b/pengine/test10/systemhealth2.scores
index 8a59654..b20bd49 100644
--- a/pengine/test10/systemhealth2.scores
+++ b/pengine/test10/systemhealth2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealth2.summary b/pengine/test10/systemhealth2.summary
index c83a7e2..b04d5a1 100644
--- a/pengine/test10/systemhealth2.summary
+++ b/pengine/test10/systemhealth2.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
diff --git a/pengine/test10/systemhealth3.scores b/pengine/test10/systemhealth3.scores
index 8a59654..b20bd49 100644
--- a/pengine/test10/systemhealth3.scores
+++ b/pengine/test10/systemhealth3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealth3.summary b/pengine/test10/systemhealth3.summary
index c83a7e2..b04d5a1 100644
--- a/pengine/test10/systemhealth3.summary
+++ b/pengine/test10/systemhealth3.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
diff --git a/pengine/test10/systemhealthm1.scores b/pengine/test10/systemhealthm1.scores
index 8a59654..c55f6e2 100644
--- a/pengine/test10/systemhealthm1.scores
+++ b/pengine/test10/systemhealthm1.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthm1.summary b/pengine/test10/systemhealthm1.summary
index 7301c6c..335b94a 100644
--- a/pengine/test10/systemhealthm1.summary
+++ b/pengine/test10/systemhealthm1.summary
@@ -7,6 +7,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Fence (reboot) hs21c
diff --git a/pengine/test10/systemhealthm2.scores b/pengine/test10/systemhealthm2.scores
index 8a59654..b20bd49 100644
--- a/pengine/test10/systemhealthm2.scores
+++ b/pengine/test10/systemhealthm2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthm2.summary b/pengine/test10/systemhealthm2.summary
index c83a7e2..b04d5a1 100644
--- a/pengine/test10/systemhealthm2.summary
+++ b/pengine/test10/systemhealthm2.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
diff --git a/pengine/test10/systemhealthm3.scores b/pengine/test10/systemhealthm3.scores
index 7e8804e..00b8d64 100644
--- a/pengine/test10/systemhealthm3.scores
+++ b/pengine/test10/systemhealthm3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: -INFINITY
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthm3.summary b/pengine/test10/systemhealthm3.summary
index fbcdec5..55d5cf7 100644
--- a/pengine/test10/systemhealthm3.summary
+++ b/pengine/test10/systemhealthm3.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
 
diff --git a/pengine/test10/systemhealthn1.scores b/pengine/test10/systemhealthn1.scores
index 8a59654..c55f6e2 100644
--- a/pengine/test10/systemhealthn1.scores
+++ b/pengine/test10/systemhealthn1.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthn1.summary b/pengine/test10/systemhealthn1.summary
index 7301c6c..335b94a 100644
--- a/pengine/test10/systemhealthn1.summary
+++ b/pengine/test10/systemhealthn1.summary
@@ -7,6 +7,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Fence (reboot) hs21c
diff --git a/pengine/test10/systemhealthn2.scores b/pengine/test10/systemhealthn2.scores
index 8a59654..b20bd49 100644
--- a/pengine/test10/systemhealthn2.scores
+++ b/pengine/test10/systemhealthn2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthn2.summary b/pengine/test10/systemhealthn2.summary
index c83a7e2..b04d5a1 100644
--- a/pengine/test10/systemhealthn2.summary
+++ b/pengine/test10/systemhealthn2.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
diff --git a/pengine/test10/systemhealthn3.scores b/pengine/test10/systemhealthn3.scores
index 8a59654..b20bd49 100644
--- a/pengine/test10/systemhealthn3.scores
+++ b/pengine/test10/systemhealthn3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthn3.summary b/pengine/test10/systemhealthn3.summary
index c83a7e2..b04d5a1 100644
--- a/pengine/test10/systemhealthn3.summary
+++ b/pengine/test10/systemhealthn3.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   stonith-1	(hs21c)
diff --git a/pengine/test10/systemhealtho1.scores b/pengine/test10/systemhealtho1.scores
index 8a59654..c55f6e2 100644
--- a/pengine/test10/systemhealtho1.scores
+++ b/pengine/test10/systemhealtho1.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealtho1.summary b/pengine/test10/systemhealtho1.summary
index 7301c6c..335b94a 100644
--- a/pengine/test10/systemhealtho1.summary
+++ b/pengine/test10/systemhealtho1.summary
@@ -7,6 +7,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Fence (reboot) hs21c
diff --git a/pengine/test10/systemhealtho2.scores b/pengine/test10/systemhealtho2.scores
index 7e8804e..00b8d64 100644
--- a/pengine/test10/systemhealtho2.scores
+++ b/pengine/test10/systemhealtho2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: -INFINITY
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealtho2.summary b/pengine/test10/systemhealtho2.summary
index fbcdec5..55d5cf7 100644
--- a/pengine/test10/systemhealtho2.summary
+++ b/pengine/test10/systemhealtho2.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
 
diff --git a/pengine/test10/systemhealtho3.scores b/pengine/test10/systemhealtho3.scores
index 7e8804e..00b8d64 100644
--- a/pengine/test10/systemhealtho3.scores
+++ b/pengine/test10/systemhealtho3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: -INFINITY
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealtho3.summary b/pengine/test10/systemhealtho3.summary
index fbcdec5..55d5cf7 100644
--- a/pengine/test10/systemhealtho3.summary
+++ b/pengine/test10/systemhealtho3.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
 
diff --git a/pengine/test10/systemhealthp1.scores b/pengine/test10/systemhealthp1.scores
index 8a59654..c55f6e2 100644
--- a/pengine/test10/systemhealthp1.scores
+++ b/pengine/test10/systemhealthp1.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 100
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthp1.summary b/pengine/test10/systemhealthp1.summary
index 7301c6c..335b94a 100644
--- a/pengine/test10/systemhealthp1.summary
+++ b/pengine/test10/systemhealthp1.summary
@@ -7,6 +7,8 @@ Node hs21d (737318c6-0f92-4592-9754-45967d45aff7): UNCLEAN (offline)
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21c: node is unclean
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Fence (reboot) hs21c
diff --git a/pengine/test10/systemhealthp2.scores b/pengine/test10/systemhealthp2.scores
index 20a08f2..7ca75bf 100644
--- a/pengine/test10/systemhealthp2.scores
+++ b/pengine/test10/systemhealthp2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: 0
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthp2.summary b/pengine/test10/systemhealthp2.summary
index ea9465b..6c44a74 100644
--- a/pengine/test10/systemhealthp2.summary
+++ b/pengine/test10/systemhealthp2.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
  * Start   apache_1	(hs21c)
diff --git a/pengine/test10/systemhealthp3.scores b/pengine/test10/systemhealthp3.scores
index 7e8804e..00b8d64 100644
--- a/pengine/test10/systemhealthp3.scores
+++ b/pengine/test10/systemhealthp3.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   hs21d: node is unclean
 Allocation scores:
 native_color: apache_1 allocation score on hs21c: -INFINITY
 native_color: apache_1 allocation score on hs21d: 0
diff --git a/pengine/test10/systemhealthp3.summary b/pengine/test10/systemhealthp3.summary
index fbcdec5..55d5cf7 100644
--- a/pengine/test10/systemhealthp3.summary
+++ b/pengine/test10/systemhealthp3.summary
@@ -7,6 +7,7 @@ Online: [ hs21c ]
  apache_1	(ocf::heartbeat:apache):	Stopped 
  nfs_1	(ocf::heartbeat:Filesystem):	Stopped 
 
+  notice: Fencing   hs21d: node is unclean
 Transition Summary:
  * Fence (reboot) hs21d
 
diff --git a/pengine/test10/ticket-clone-21.scores b/pengine/test10/ticket-clone-21.scores
index 89e2d0f..e0fc0d8 100644
--- a/pengine/test10/ticket-clone-21.scores
+++ b/pengine/test10/ticket-clone-21.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 clone_color: clone1 allocation score on node1: 0
 clone_color: clone1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary
index 573f8c1..13d2887 100644
--- a/pengine/test10/ticket-clone-21.summary
+++ b/pengine/test10/ticket-clone-21.summary
@@ -6,6 +6,8 @@ Online: [ node1 node2 ]
  Clone Set: clone1 [rsc1]
      Started: [ node1 node2 ]
 
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Fence (reboot) node1
diff --git a/pengine/test10/ticket-clone-9.scores b/pengine/test10/ticket-clone-9.scores
index 89e2d0f..e0fc0d8 100644
--- a/pengine/test10/ticket-clone-9.scores
+++ b/pengine/test10/ticket-clone-9.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 clone_color: clone1 allocation score on node1: 0
 clone_color: clone1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary
index 573f8c1..13d2887 100644
--- a/pengine/test10/ticket-clone-9.summary
+++ b/pengine/test10/ticket-clone-9.summary
@@ -6,6 +6,8 @@ Online: [ node1 node2 ]
  Clone Set: clone1 [rsc1]
      Started: [ node1 node2 ]
 
+  notice: Fencing   node1: node is unclean
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Fence (reboot) node1
diff --git a/pengine/test10/ticket-group-21.scores b/pengine/test10/ticket-group-21.scores
index e5b8167..8f01379 100644
--- a/pengine/test10/ticket-group-21.scores
+++ b/pengine/test10/ticket-group-21.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-group-21.summary b/pengine/test10/ticket-group-21.summary
index ff809ae..80fb33f 100644
--- a/pengine/test10/ticket-group-21.summary
+++ b/pengine/test10/ticket-group-21.summary
@@ -7,6 +7,7 @@ Online: [ node1 node2 ]
      rsc1	(ocf::pacemaker:Dummy):	Started node2
      rsc2	(ocf::pacemaker:Dummy):	Started node2
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Stop    rsc1	(node2)
diff --git a/pengine/test10/ticket-group-9.scores b/pengine/test10/ticket-group-9.scores
index e5b8167..8f01379 100644
--- a/pengine/test10/ticket-group-9.scores
+++ b/pengine/test10/ticket-group-9.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-group-9.summary b/pengine/test10/ticket-group-9.summary
index ff809ae..80fb33f 100644
--- a/pengine/test10/ticket-group-9.summary
+++ b/pengine/test10/ticket-group-9.summary
@@ -7,6 +7,7 @@ Online: [ node1 node2 ]
      rsc1	(ocf::pacemaker:Dummy):	Started node2
      rsc2	(ocf::pacemaker:Dummy):	Started node2
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Stop    rsc1	(node2)
diff --git a/pengine/test10/ticket-master-21.scores b/pengine/test10/ticket-master-21.scores
index dc79d67..89eac5e 100644
--- a/pengine/test10/ticket-master-21.scores
+++ b/pengine/test10/ticket-master-21.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 clone_color: ms1 allocation score on node1: 0
 clone_color: ms1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-master-21.summary b/pengine/test10/ticket-master-21.summary
index c196c9d..dc2f5db 100644
--- a/pengine/test10/ticket-master-21.summary
+++ b/pengine/test10/ticket-master-21.summary
@@ -7,6 +7,7 @@ Online: [ node1 node2 ]
      Masters: [ node1 ]
      Slaves: [ node2 ]
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Move    rsc_stonith	(Started node1 -> node2)
diff --git a/pengine/test10/ticket-master-9.scores b/pengine/test10/ticket-master-9.scores
index dc79d67..89eac5e 100644
--- a/pengine/test10/ticket-master-9.scores
+++ b/pengine/test10/ticket-master-9.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node1: node is unclean
 Allocation scores:
 clone_color: ms1 allocation score on node1: 0
 clone_color: ms1 allocation score on node2: 0
diff --git a/pengine/test10/ticket-master-9.summary b/pengine/test10/ticket-master-9.summary
index c196c9d..dc2f5db 100644
--- a/pengine/test10/ticket-master-9.summary
+++ b/pengine/test10/ticket-master-9.summary
@@ -7,6 +7,7 @@ Online: [ node1 node2 ]
      Masters: [ node1 ]
      Slaves: [ node2 ]
 
+  notice: Fencing   node1: node is unclean
 Transition Summary:
  * Fence (reboot) node1
  * Move    rsc_stonith	(Started node1 -> node2)
diff --git a/pengine/test10/ticket-primitive-21.scores b/pengine/test10/ticket-primitive-21.scores
index ed3f3cd..d1147ca 100644
--- a/pengine/test10/ticket-primitive-21.scores
+++ b/pengine/test10/ticket-primitive-21.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: -INFINITY
diff --git a/pengine/test10/ticket-primitive-21.summary b/pengine/test10/ticket-primitive-21.summary
index 08a4860..d3d02fe 100644
--- a/pengine/test10/ticket-primitive-21.summary
+++ b/pengine/test10/ticket-primitive-21.summary
@@ -5,6 +5,7 @@ Online: [ node1 node2 ]
  rsc_stonith	(stonith:null):	Started node1
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Stop    rsc1	(node2)
diff --git a/pengine/test10/ticket-primitive-9.scores b/pengine/test10/ticket-primitive-9.scores
index ed3f3cd..d1147ca 100644
--- a/pengine/test10/ticket-primitive-9.scores
+++ b/pengine/test10/ticket-primitive-9.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   node2: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: -INFINITY
diff --git a/pengine/test10/ticket-primitive-9.summary b/pengine/test10/ticket-primitive-9.summary
index 08a4860..d3d02fe 100644
--- a/pengine/test10/ticket-primitive-9.summary
+++ b/pengine/test10/ticket-primitive-9.summary
@@ -5,6 +5,7 @@ Online: [ node1 node2 ]
  rsc_stonith	(stonith:null):	Started node1
  rsc1	(ocf::pacemaker:Dummy):	Started node2
 
+  notice: Fencing   node2: node is unclean
 Transition Summary:
  * Fence (reboot) node2
  * Stop    rsc1	(node2)
diff --git a/pengine/test10/unfence-definition.dot b/pengine/test10/unfence-definition.dot
index a9e7e6b..c16bdb5 100644
--- a/pengine/test10/unfence-definition.dot
+++ b/pengine/test10/unfence-definition.dot
@@ -19,7 +19,6 @@ digraph "g" {
 "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold]
-"clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_start_0 virt-3" -> "clvmd-clone_running_0" [ style = bold]
 "clvmd:2_start_0 virt-3" [ style=bold color="green" fontcolor="black"]
@@ -44,7 +43,6 @@ digraph "g" {
 "dlm-clone_stopped_0" -> "dlm-clone_start_0" [ style = bold]
 "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold]
-"dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "dlm:2_start_0 virt-3" -> "dlm-clone_running_0" [ style = bold]
@@ -70,9 +68,10 @@ digraph "g" {
 "stonith 'on' virt-1" -> "clvmd_start_0 virt-1" [ style = bold]
 "stonith 'on' virt-1" -> "dlm_start_0 virt-1" [ style = bold]
 "stonith 'on' virt-1" [ style=bold color="green" fontcolor="black"]
+"stonith 'on' virt-3" -> "clvmd:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
+"stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
diff --git a/pengine/test10/unfence-definition.exp b/pengine/test10/unfence-definition.exp
index 46d5883..f9ad4c1 100644
--- a/pengine/test10/unfence-definition.exp
+++ b/pengine/test10/unfence-definition.exp
@@ -21,18 +21,14 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1" priority="1000000">
+  <synapse id="1">
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
@@ -124,7 +120,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
@@ -284,7 +284,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="18" priority="1000000">
     <action_set>
@@ -380,19 +384,12 @@
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="25">
     <action_set>
       <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_node_unfenced="1234567" CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
     <inputs>
diff --git a/pengine/test10/unfence-definition.scores b/pengine/test10/unfence-definition.scores
index d9fa9bb..3d5aa9f 100644
--- a/pengine/test10/unfence-definition.scores
+++ b/pengine/test10/unfence-definition.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   virt-4: node is unclean
+  notice: Unfencing virt-1: Device definition changed
+  notice: Unfencing virt-3: Required by dlm:2
 Allocation scores:
 clone_color: clvmd-clone allocation score on virt-1: 0
 clone_color: clvmd-clone allocation score on virt-2: 0
diff --git a/pengine/test10/unfence-definition.summary b/pengine/test10/unfence-definition.summary
index 9477a02..a31cc20 100644
--- a/pengine/test10/unfence-definition.summary
+++ b/pengine/test10/unfence-definition.summary
@@ -11,6 +11,9 @@ Online: [ virt-1 virt-2 virt-3 ]
      Started: [ virt-1 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
+  notice: Unfencing virt-1: Device definition changed
+  notice: Unfencing virt-3: Required by dlm:2
+  notice: Fencing   virt-4: node is unclean
 Transition Summary:
  * Fence (reboot) virt-4
  * Fence (on) virt-3
@@ -23,18 +26,18 @@ Transition Summary:
  * Start   clvmd:2	(virt-3)
 
 Executing cluster transition:
- * Resource action: dlm             monitor on virt-3
+ * Resource action: fencing         monitor on virt-3
+ * Resource action: fencing         stop on virt-1
  * Resource action: clvmd           monitor on virt-2
- * Resource action: clvmd           monitor on virt-3
  * Pseudo action:   clvmd-clone_stop_0
  * Fencing virt-4 (reboot)
  * Pseudo action:   stonith_complete
  * Fencing virt-3 (on)
- * Resource action: fencing         monitor on virt-3
- * Resource action: fencing         stop on virt-1
+ * Resource action: fencing         delete on virt-1
+ * Resource action: dlm             monitor on virt-3
  * Resource action: clvmd           stop on virt-1
+ * Resource action: clvmd           monitor on virt-3
  * Pseudo action:   clvmd-clone_stopped_0
- * Resource action: fencing         delete on virt-1
  * Pseudo action:   dlm-clone_stop_0
  * Resource action: dlm             stop on virt-1
  * Pseudo action:   dlm-clone_stopped_0
diff --git a/pengine/test10/unfence-definition.xml b/pengine/test10/unfence-definition.xml
index 5d77931..cb189cd 100644
--- a/pengine/test10/unfence-definition.xml
+++ b/pengine/test10/unfence-definition.xml
@@ -41,6 +41,11 @@
   </configuration>
   <status>
     <node_state id="1" uname="virt-1" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-1">
+        <instance_attributes id="status-virt-1">
+          <nvpair id="status-virt-1" name="node_unfenced" value="1234567"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_virt" class="stonith">
@@ -56,6 +61,11 @@
       </lrm>
     </node_state>
     <node_state id="2" uname="virt-2" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-2">
+        <instance_attributes id="status-virt-2">
+          <nvpair id="unfenced-virt-2" name="node_unfenced" value="1234567"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_scsi" class="stonith">
diff --git a/pengine/test10/unfence-parameters.dot b/pengine/test10/unfence-parameters.dot
index c96d314..dee850e 100644
--- a/pengine/test10/unfence-parameters.dot
+++ b/pengine/test10/unfence-parameters.dot
@@ -14,13 +14,11 @@ digraph "g" {
 "clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold]
 "clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "clvmd:1_monitor_0 virt-2" -> "clvmd-clone_start_0" [ style = bold]
-"clvmd:1_monitor_0 virt-2" -> "stonith 'on' virt-2" [ style = bold]
 "clvmd:1_monitor_0 virt-2" [ style=bold color="green" fontcolor="black"]
 "clvmd:1_start_0 virt-2" -> "clvmd-clone_running_0" [ style = bold]
 "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold]
-"clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_start_0 virt-3" -> "clvmd-clone_running_0" [ style = bold]
 "clvmd:2_start_0 virt-3" -> "clvmd:3_start_0 <none>" [ style = dashed]
@@ -50,7 +48,6 @@ digraph "g" {
 "dlm-clone_stopped_0" -> "dlm-clone_start_0" [ style = bold]
 "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold]
-"dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "dlm:2_start_0 virt-3" -> "dlm-clone_running_0" [ style = bold]
@@ -85,12 +82,14 @@ digraph "g" {
 "stonith 'on' virt-1" -> "clvmd_start_0 virt-1" [ style = bold]
 "stonith 'on' virt-1" -> "dlm_start_0 virt-1" [ style = bold]
 "stonith 'on' virt-1" [ style=bold color="green" fontcolor="black"]
+"stonith 'on' virt-2" -> "clvmd:1_monitor_0 virt-2" [ style = bold]
 "stonith 'on' virt-2" -> "clvmd:1_start_0 virt-2" [ style = bold]
 "stonith 'on' virt-2" -> "dlm_start_0 virt-2" [ style = bold]
 "stonith 'on' virt-2" [ style=bold color="green" fontcolor="black"]
+"stonith 'on' virt-3" -> "clvmd:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
+"stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
diff --git a/pengine/test10/unfence-parameters.exp b/pengine/test10/unfence-parameters.exp
index ffc20c0..54c242a 100644
--- a/pengine/test10/unfence-parameters.exp
+++ b/pengine/test10/unfence-parameters.exp
@@ -12,18 +12,14 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1" priority="1000000">
+  <synapse id="1">
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
@@ -152,7 +148,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="9" priority="1000000">
     <action_set>
@@ -290,7 +290,11 @@
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="3" operation="stonith" operation_key="stonith-virt-2-on" on_node="virt-2" on_node_uuid="2"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
@@ -324,7 +328,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="19" priority="1000000">
     <action_set>
@@ -420,26 +428,16 @@
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="26">
     <action_set>
       <crm_event id="3" operation="stonith" operation_key="stonith-virt-2-on" on_node="virt-2" on_node_uuid="2">
-        <attributes CRM_meta_on_node="virt-2" CRM_meta_on_node_uuid="2" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_node_unfenced="1234567" CRM_meta_on_node="virt-2" CRM_meta_on_node_uuid="2" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
         <rsc_op id="14" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:1_stop_0" on_node="virt-2" on_node_uuid="2"/>
       </trigger>
     </inputs>
@@ -447,7 +445,7 @@
   <synapse id="27">
     <action_set>
       <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_node_unfenced="1234567" CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
     <inputs>
diff --git a/pengine/test10/unfence-parameters.scores b/pengine/test10/unfence-parameters.scores
index d9fa9bb..5089910 100644
--- a/pengine/test10/unfence-parameters.scores
+++ b/pengine/test10/unfence-parameters.scores
@@ -1,3 +1,7 @@
+  notice: Fencing   virt-4: node is unclean
+  notice: Unfencing virt-1: Device parameters changed (reload)
+  notice: Unfencing virt-2: Device parameters changed (reload)
+  notice: Unfencing virt-3: Device parameters changed (reload)
 Allocation scores:
 clone_color: clvmd-clone allocation score on virt-1: 0
 clone_color: clvmd-clone allocation score on virt-2: 0
diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary
index a713cd5..8effc63 100644
--- a/pengine/test10/unfence-parameters.summary
+++ b/pengine/test10/unfence-parameters.summary
@@ -11,6 +11,10 @@ Online: [ virt-1 virt-2 virt-3 ]
      Started: [ virt-1 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
+  notice: Unfencing virt-1: Device parameters changed (reload)
+  notice: Unfencing virt-2: Device parameters changed (reload)
+  notice: Unfencing virt-3: Device parameters changed (reload)
+  notice: Fencing   virt-4: node is unclean
 Transition Summary:
  * Fence (reboot) virt-4
  * Fence (on) virt-3
@@ -25,23 +29,23 @@ Transition Summary:
  * Start   clvmd:2	(virt-3)
 
 Executing cluster transition:
- * Resource action: dlm             monitor on virt-3
- * Resource action: clvmd           monitor on virt-2
- * Resource action: clvmd           monitor on virt-3
+ * Resource action: fencing         monitor on virt-3
  * Pseudo action:   clvmd-clone_stop_0
  * Fencing virt-4 (reboot)
  * Pseudo action:   stonith_complete
  * Fencing virt-3 (on)
- * Resource action: fencing         monitor on virt-3
+ * Resource action: fencing         stop on virt-1
+ * Resource action: dlm             monitor on virt-3
  * Resource action: clvmd           stop on virt-1
+ * Resource action: clvmd           monitor on virt-3
  * Pseudo action:   clvmd-clone_stopped_0
- * Resource action: fencing         stop on virt-1
  * Pseudo action:   dlm-clone_stop_0
  * Resource action: dlm             stop on virt-2
  * Fencing virt-2 (on)
  * Resource action: dlm             stop on virt-1
  * Pseudo action:   dlm-clone_stopped_0
  * Pseudo action:   dlm-clone_start_0
+ * Resource action: clvmd           monitor on virt-2
  * Fencing virt-1 (on)
  * Pseudo action:   all_stopped
  * Resource action: fencing         start on virt-1
diff --git a/pengine/test10/unfence-parameters.xml b/pengine/test10/unfence-parameters.xml
index f660100..26588bf 100644
--- a/pengine/test10/unfence-parameters.xml
+++ b/pengine/test10/unfence-parameters.xml
@@ -41,6 +41,11 @@
   </configuration>
   <status>
     <node_state id="1" uname="virt-1" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-1">
+        <instance_attributes id="status-virt-1">
+          <nvpair id="status-virt-1" name="node_unfenced" value="1234567"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_scsi" class="stonith">
@@ -56,6 +61,11 @@
       </lrm>
     </node_state>
     <node_state id="2" uname="virt-2" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-2">
+        <instance_attributes id="status-virt-2">
+          <nvpair id="status-virt-2" name="node_unfenced" value="1234567"/>
+	</instance_attributes>
+      </transient_attributes>
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_scsi" class="stonith">
diff --git a/pengine/test10/unfence-startup.dot b/pengine/test10/unfence-startup.dot
index 20f1367..d496956 100644
--- a/pengine/test10/unfence-startup.dot
+++ b/pengine/test10/unfence-startup.dot
@@ -11,7 +11,6 @@ digraph "g" {
 "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold]
-"clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "clvmd:2_start_0 virt-3" -> "clvmd-clone_running_0" [ style = bold]
 "clvmd:2_start_0 virt-3" [ style=bold color="green" fontcolor="black"]
@@ -21,15 +20,15 @@ digraph "g" {
 "dlm-clone_start_0" -> "dlm:2_start_0 virt-3" [ style = bold]
 "dlm-clone_start_0" [ style=bold color="green" fontcolor="orange"]
 "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold]
-"dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold]
 "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
 "dlm:2_start_0 virt-3" -> "dlm-clone_running_0" [ style = bold]
 "dlm:2_start_0 virt-3" [ style=bold color="green" fontcolor="black"]
 "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"]
+"stonith 'on' virt-3" -> "clvmd:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold]
+"stonith 'on' virt-3" -> "dlm:2_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold]
-"stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold]
 "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"]
diff --git a/pengine/test10/unfence-startup.exp b/pengine/test10/unfence-startup.exp
index a13ffca..70c1686 100644
--- a/pengine/test10/unfence-startup.exp
+++ b/pengine/test10/unfence-startup.exp
@@ -1,16 +1,12 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
-  <synapse id="0" priority="1000000">
+  <synapse id="0">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
@@ -38,7 +34,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="3" priority="1000000">
     <action_set>
@@ -124,7 +124,11 @@
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="9" priority="1000000">
     <action_set>
@@ -191,14 +195,7 @@
         <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
       </crm_event>
     </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="14">
     <action_set>
diff --git a/pengine/test10/unfence-startup.scores b/pengine/test10/unfence-startup.scores
index d9fa9bb..0172a9d 100644
--- a/pengine/test10/unfence-startup.scores
+++ b/pengine/test10/unfence-startup.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   virt-4: node is unclean
+  notice: Unfencing virt-3: Required by dlm:2
 Allocation scores:
 clone_color: clvmd-clone allocation score on virt-1: 0
 clone_color: clvmd-clone allocation score on virt-2: 0
diff --git a/pengine/test10/unfence-startup.summary b/pengine/test10/unfence-startup.summary
index c3f1be4..6a49f42 100644
--- a/pengine/test10/unfence-startup.summary
+++ b/pengine/test10/unfence-startup.summary
@@ -11,6 +11,8 @@ Online: [ virt-1 virt-2 virt-3 ]
      Started: [ virt-1 ]
      Stopped: [ virt-2 virt-3 virt-4 ]
 
+  notice: Unfencing virt-3: Required by dlm:2
+  notice: Fencing   virt-4: node is unclean
 Transition Summary:
  * Fence (reboot) virt-4
  * Fence (on) virt-3
@@ -19,15 +21,15 @@ Transition Summary:
  * Start   clvmd:2	(virt-3)
 
 Executing cluster transition:
- * Resource action: dlm             monitor on virt-3
- * Pseudo action:   dlm-clone_start_0
+ * Resource action: fencing         monitor on virt-3
  * Resource action: clvmd           monitor on virt-2
- * Resource action: clvmd           monitor on virt-3
  * Fencing virt-4 (reboot)
  * Pseudo action:   stonith_complete
  * Fencing virt-3 (on)
  * Pseudo action:   all_stopped
- * Resource action: fencing         monitor on virt-3
+ * Resource action: dlm             monitor on virt-3
+ * Pseudo action:   dlm-clone_start_0
+ * Resource action: clvmd           monitor on virt-3
  * Resource action: dlm             start on virt-3
  * Pseudo action:   dlm-clone_running_0
  * Pseudo action:   clvmd-clone_start_0
diff --git a/pengine/test10/unfence-startup.xml b/pengine/test10/unfence-startup.xml
index 83e9ffe..28637e3 100644
--- a/pengine/test10/unfence-startup.xml
+++ b/pengine/test10/unfence-startup.xml
@@ -41,6 +41,11 @@
   </configuration>
   <status>
     <node_state id="1" uname="virt-1" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-1">
+        <instance_attributes id="status-virt-1">
+          <nvpair id="status-virt-1" name="node_unfenced" value="1234567"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_scsi" class="stonith">
@@ -56,6 +61,11 @@
       </lrm>
     </node_state>
     <node_state id="2" uname="virt-2" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <transient_attributes id="virt-2">
+        <instance_attributes id="status-virt-2">
+          <nvpair id="status-virt-2" name="node_unfenced" value="1234567"/>
+        </instance_attributes>
+      </transient_attributes>
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="fencing" type="fence_scsi" class="stonith">
diff --git a/pengine/test10/whitebox-fail1.scores b/pengine/test10/whitebox-fail1.scores
index 4fbbf29..02192a9 100644
--- a/pengine/test10/whitebox-fail1.scores
+++ b/pengine/test10/whitebox-fail1.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   lxc1: guest is unclean
 Allocation scores:
 clone_color: M-clone allocation score on 18node1: 0
 clone_color: M-clone allocation score on 18node2: 0
diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary
index 57d72ba..c7b5e19 100644
--- a/pengine/test10/whitebox-fail1.summary
+++ b/pengine/test10/whitebox-fail1.summary
@@ -13,6 +13,7 @@ Containers: [ lxc2:container2 ]
  C	(ocf::pacemaker:Dummy):	Started lxc2
  D	(ocf::pacemaker:Dummy):	Started 18node1
 
+  notice: Fencing   lxc1: guest is unclean
 Transition Summary:
  * Fence (reboot) lxc1 (resource: container1)
  * Recover container1	(Started 18node2)
diff --git a/pengine/test10/whitebox-fail2.scores b/pengine/test10/whitebox-fail2.scores
index 4fbbf29..02192a9 100644
--- a/pengine/test10/whitebox-fail2.scores
+++ b/pengine/test10/whitebox-fail2.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   lxc1: guest is unclean
 Allocation scores:
 clone_color: M-clone allocation score on 18node1: 0
 clone_color: M-clone allocation score on 18node2: 0
diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary
index bf12683..73e968e 100644
--- a/pengine/test10/whitebox-fail2.summary
+++ b/pengine/test10/whitebox-fail2.summary
@@ -13,6 +13,7 @@ Containers: [ lxc2:container2 ]
  C	(ocf::pacemaker:Dummy):	Started lxc2
  D	(ocf::pacemaker:Dummy):	Started 18node1
 
+  notice: Fencing   lxc1: guest is unclean
 Transition Summary:
  * Fence (reboot) lxc1 (resource: container1)
  * Recover container1	(Started 18node2)
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.scores b/pengine/test10/whitebox-imply-stop-on-fence.scores
index e50f077..5c3e325 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.scores
+++ b/pengine/test10/whitebox-imply-stop-on-fence.scores
@@ -1,3 +1,6 @@
+  notice: Fencing   kiff-01: node is unclean
+  notice: Fencing   lxc-01_kiff-01: guest is unclean
+  notice: Fencing   lxc-02_kiff-01: guest is unclean
 Allocation scores:
 clone_color: clvmd-clone allocation score on kiff-01: 0
 clone_color: clvmd-clone allocation score on kiff-02: 0
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.summary b/pengine/test10/whitebox-imply-stop-on-fence.summary
index 2fb20a6..a74bb72 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.summary
+++ b/pengine/test10/whitebox-imply-stop-on-fence.summary
@@ -24,6 +24,9 @@ Containers: [ lxc-01_kiff-02:R-lxc-01_kiff-02 lxc-02_kiff-02:R-lxc-02_kiff-02 ]
  R-lxc-02_kiff-02	(ocf::heartbeat:VirtualDomain):	Started kiff-02 
  vm-fs	(ocf::heartbeat:Filesystem):	FAILED lxc-01_kiff-01
 
+  notice: Fencing   kiff-01: node is unclean
+  notice: Fencing   lxc-01_kiff-01: guest is unclean
+  notice: Fencing   lxc-02_kiff-01: guest is unclean
 Transition Summary:
  * Fence (reboot) lxc-02_kiff-01 (resource: R-lxc-02_kiff-01)
  * Fence (reboot) lxc-01_kiff-01 (resource: R-lxc-01_kiff-01)
diff --git a/pengine/test10/whitebox-ms-ordering.scores b/pengine/test10/whitebox-ms-ordering.scores
index f0e51f5..72e6d25 100644
--- a/pengine/test10/whitebox-ms-ordering.scores
+++ b/pengine/test10/whitebox-ms-ordering.scores
@@ -1,3 +1,5 @@
+  notice: Fencing   lxc1: guest is unclean
+  notice: Fencing   lxc2: guest is unclean
 Allocation scores:
 clone_color: lxc-ms-master allocation score on 18node1: 0
 clone_color: lxc-ms-master allocation score on 18node2: 0
diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
index 2230d0f..41436f8 100644
--- a/pengine/test10/whitebox-ms-ordering.summary
+++ b/pengine/test10/whitebox-ms-ordering.summary
@@ -8,6 +8,8 @@ Online: [ 18node1 18node2 18node3 ]
  Master/Slave Set: lxc-ms-master [lxc-ms]
      Stopped: [ 18node1 18node2 18node3 ]
 
+  notice: Fencing   lxc1: guest is unclean
+  notice: Fencing   lxc2: guest is unclean
 Transition Summary:
  * Fence (reboot) lxc2 (resource: container2)
  * Fence (reboot) lxc1 (resource: container1)
diff --git a/pengine/test10/whitebox-unexpectedly-running.scores b/pengine/test10/whitebox-unexpectedly-running.scores
index 7f8a1d9..eb8a6f9 100644
--- a/pengine/test10/whitebox-unexpectedly-running.scores
+++ b/pengine/test10/whitebox-unexpectedly-running.scores
@@ -1,3 +1,4 @@
+  notice: Fencing   remote1: guest is unclean
 Allocation scores:
 native_color: FAKE allocation score on 18builder: 0
 native_color: FAKE allocation score on remote1: -INFINITY
diff --git a/pengine/test10/whitebox-unexpectedly-running.summary b/pengine/test10/whitebox-unexpectedly-running.summary
index eabeb4d..3888aa2 100644
--- a/pengine/test10/whitebox-unexpectedly-running.summary
+++ b/pengine/test10/whitebox-unexpectedly-running.summary
@@ -4,6 +4,7 @@ Online: [ 18builder ]
 
  FAKE	(ocf::pacemaker:Dummy):	FAILED 18builder 
 
+  notice: Fencing   remote1: guest is unclean
 Transition Summary:
  * Fence (reboot) remote1 (resource: FAKE)
  * Recover FAKE	(Started 18builder)
-- 
1.8.3.1


From 736725733cc23897b4f18d59db24747077092ed6 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Wed, 26 Jul 2017 13:51:15 +1000
Subject: [PATCH 03/12] Fix: Correctly compare remote unfencing digests

---
 lib/pengine/utils.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 90da95a..5d2a1b9 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -2112,20 +1944,24 @@ fencing_action_digest_cmp(resource_t * rsc, node_t * node, pe_working_set_t * da
     const char *digest_all = g_hash_table_lookup(node->details->attrs, "digests-all");
     const char *digest_secure = g_hash_table_lookup(node->details->attrs, "digests-secure");
 
-    /* No restarts for fencing device changes */
+    /* No 'reloads' for fencing device changes
+     *
+     * We use the resource id + agent + digest so that we can detect
+     * changes to the agent and/or the parameters used
+     */
+    char *search_all = crm_strdup_printf("%s:%s:%s", rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
+    char *search_secure = crm_strdup_printf("%s:%s:%s", rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
 
     data->rc = RSC_DIGEST_ALL;
     if (digest_all == NULL) {
         /* it is unknown what the previous op digest was */
         data->rc = RSC_DIGEST_UNKNOWN;
 
-    } else if (strcmp(digest_all, data->digest_all_calc) == 0) {
+    } else if (strstr(digest_all, search_all)) {
         data->rc = RSC_DIGEST_MATCH;
 
     } else if(digest_secure && data->digest_secure_calc) {
-        char *search = crm_strdup_printf("%s:%s:%s", rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
-
-        if(strstr(digest_secure, search)) {
+        if(strstr(digest_secure, search_secure)) {
             fprintf(stdout, "Only 'private' parameters to %s for unfencing %s changed\n",
                     rsc->id, node->details->uname);
             data->rc = RSC_DIGEST_MATCH;
@@ -2137,7 +1974,11 @@ fencing_action_digest_cmp(resource_t * rsc, node_t * node, pe_working_set_t * da
                 rsc->id, node->details->uname, rsc->id, (const char*)g_hash_table_lookup(rsc->meta, XML_ATTR_TYPE), data->digest_secure_calc);
     }
 
+
     free(key);
+    free(search_all);
+    free(search_secure);
+
     return data;
 }
 
-- 
1.8.3.1


From e0dbe6cf3ef982f6644cc4d4e81381bdf184b0d6 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Wed, 26 Jul 2017 13:47:58 +1000
Subject: [PATCH 04/12] Log: Mechanism for recording why an action is required

---
 include/crm/pengine/internal.h                     |   3 +
 include/crm/pengine/status.h                       |   1 +
 lib/pengine/unpack.c                               |   2 +
 lib/pengine/utils.c                                |  30 +-
 pengine/allocate.c                                 |   8 +-
 pengine/native.c                                   |   8 +-
 pengine/test10/594.exp                             | 113 ++++---
 pengine/test10/594.scores                          |   1 -
 pengine/test10/594.summary                         |   5 +-
 pengine/test10/797.exp                             | 134 ++++----
 pengine/test10/829.exp                             | 115 ++++---
 pengine/test10/829.scores                          |   1 -
 pengine/test10/829.summary                         |   5 +-
 pengine/test10/bug-5186-partial-migrate.exp        | 178 +++++------
 pengine/test10/bug-5186-partial-migrate.scores     |   1 -
 pengine/test10/bug-5186-partial-migrate.summary    |   5 +-
 pengine/test10/bug-cl-5212.exp                     |  52 ++--
 pengine/test10/bug-cl-5247.scores                  |   1 -
 pengine/test10/bug-cl-5247.summary                 |   3 +-
 pengine/test10/bug-lf-2508.exp                     | 243 ++++++++-------
 pengine/test10/bug-lf-2508.scores                  |   1 -
 pengine/test10/bug-lf-2508.summary                 |  11 +-
 pengine/test10/bug-lf-2551.exp                     | 325 ++++++++++----------
 pengine/test10/bug-lf-2551.scores                  |   1 -
 pengine/test10/bug-lf-2551.summary                 |   7 +-
 pengine/test10/bug-lf-2606.exp                     |  91 +++---
 pengine/test10/bug-lf-2606.scores                  |   1 -
 pengine/test10/bug-lf-2606.summary                 |   5 +-
 pengine/test10/bug-rh-1097457.scores               |   1 -
 pengine/test10/bug-rh-1097457.summary              |   3 +-
 pengine/test10/concurrent-fencing.exp              |  72 ++---
 pengine/test10/concurrent-fencing.scores           |   3 -
 pengine/test10/concurrent-fencing.summary          |   9 +-
 pengine/test10/guest-node-host-dies.exp            | 300 +++++++++---------
 pengine/test10/guest-node-host-dies.scores         |   3 -
 pengine/test10/guest-node-host-dies.summary        |   9 +-
 pengine/test10/interleave-pseudo-stop.exp          | 191 ++++++------
 pengine/test10/interleave-pseudo-stop.scores       |   1 -
 pengine/test10/interleave-pseudo-stop.summary      |   5 +-
 pengine/test10/master-7.exp                        | 263 ++++++++--------
 pengine/test10/master-7.scores                     |   1 -
 pengine/test10/master-7.summary                    |   9 +-
 pengine/test10/master-8.exp                        | 295 +++++++++---------
 pengine/test10/master-8.scores                     |   1 -
 pengine/test10/master-8.summary                    |   9 +-
 pengine/test10/migrate-fencing.exp                 | 291 +++++++++---------
 pengine/test10/migrate-fencing.scores              |   1 -
 pengine/test10/migrate-fencing.summary             |  15 +-
 pengine/test10/rec-node-10.exp                     |   6 +-
 pengine/test10/rec-node-11.exp                     | 127 ++++----
 pengine/test10/rec-node-11.scores                  |   1 -
 pengine/test10/rec-node-11.summary                 |   5 +-
 pengine/test10/rec-node-12.scores                  |   1 -
 pengine/test10/rec-node-12.summary                 |   3 +-
 pengine/test10/rec-node-13.exp                     |  51 ++--
 pengine/test10/rec-node-13.scores                  |   1 -
 pengine/test10/rec-node-13.summary                 |   5 +-
 pengine/test10/rec-node-14.exp                     |  61 ++--
 pengine/test10/rec-node-14.scores                  |   3 -
 pengine/test10/rec-node-14.summary                 |   9 +-
 pengine/test10/rec-node-15.exp                     | 207 +++++++------
 pengine/test10/rec-node-15.scores                  |   1 -
 pengine/test10/rec-node-15.summary                 |  19 +-
 pengine/test10/rec-node-2.scores                   |   1 -
 pengine/test10/rec-node-2.summary                  |   3 +-
 pengine/test10/rec-node-4.exp                      |  77 +++--
 pengine/test10/rec-node-4.scores                   |   1 -
 pengine/test10/rec-node-4.summary                  |   5 +-
 pengine/test10/rec-node-5.exp                      |  12 +-
 pengine/test10/rec-node-6.exp                      |  77 +++--
 pengine/test10/rec-node-6.scores                   |   1 -
 pengine/test10/rec-node-6.summary                  |   5 +-
 pengine/test10/rec-node-7.exp                      |  77 +++--
 pengine/test10/rec-node-7.scores                   |   1 -
 pengine/test10/rec-node-7.summary                  |   5 +-
 pengine/test10/rec-node-8.exp                      |   8 +-
 pengine/test10/rec-rsc-5.exp                       |  77 +++--
 pengine/test10/rec-rsc-5.scores                    |   1 -
 pengine/test10/rec-rsc-5.summary                   |   5 +-
 pengine/test10/remote-fence-before-reconnect.exp   |  54 ++--
 .../test10/remote-fence-before-reconnect.scores    |   1 -
 .../test10/remote-fence-before-reconnect.summary   |   5 +-
 pengine/test10/remote-fence-unclean-3.exp          |  34 +--
 pengine/test10/remote-fence-unclean-3.scores       |   1 -
 pengine/test10/remote-fence-unclean-3.summary      |   3 +-
 pengine/test10/remote-fence-unclean.exp            |  90 +++---
 pengine/test10/remote-fence-unclean.scores         |   1 -
 pengine/test10/remote-fence-unclean.summary        |  13 +-
 pengine/test10/remote-fence-unclean2.exp           |  38 +--
 pengine/test10/remote-fence-unclean2.scores        |   1 -
 pengine/test10/remote-fence-unclean2.summary       |   5 +-
 pengine/test10/remote-partial-migrate2.exp         | 336 ++++++++++-----------
 pengine/test10/remote-partial-migrate2.scores      |   1 -
 pengine/test10/remote-partial-migrate2.summary     |   3 +-
 pengine/test10/remote-recover-all.exp              | 318 +++++++++----------
 pengine/test10/remote-recover-all.scores           |   3 -
 pengine/test10/remote-recover-all.summary          |   9 +-
 pengine/test10/remote-recover-connection.exp       | 248 +++++++--------
 pengine/test10/remote-recover-connection.scores    |   1 -
 pengine/test10/remote-recover-connection.summary   |   5 +-
 pengine/test10/remote-recover-fail.exp             |  88 +++---
 pengine/test10/remote-recover-fail.scores          |   1 -
 pengine/test10/remote-recover-fail.summary         |   9 +-
 pengine/test10/remote-recover-no-resources.exp     | 276 ++++++++---------
 pengine/test10/remote-recover-no-resources.scores  |   2 -
 pengine/test10/remote-recover-no-resources.summary |   6 +-
 pengine/test10/remote-recover-unknown.exp          | 288 +++++++++---------
 pengine/test10/remote-recover-unknown.scores       |   3 -
 pengine/test10/remote-recover-unknown.summary      |  27 +-
 pengine/test10/remote-recover.exp                  |  16 +-
 pengine/test10/remote-recovery.exp                 | 248 +++++++--------
 pengine/test10/remote-recovery.scores              |   1 -
 pengine/test10/remote-recovery.summary             |   5 +-
 pengine/test10/remote-unclean2.exp                 |  44 +--
 pengine/test10/remote-unclean2.scores              |   1 -
 pengine/test10/remote-unclean2.summary             |   3 +-
 pengine/test10/start-then-stop-with-unfence.scores |   1 -
 .../test10/start-then-stop-with-unfence.summary    |   3 +-
 pengine/test10/stonith-0.exp                       | 222 +++++++-------
 pengine/test10/stonith-0.scores                    |   2 -
 pengine/test10/stonith-0.summary                   |   8 +-
 pengine/test10/stonith-1.exp                       | 237 ++++++++-------
 pengine/test10/stonith-1.scores                    |   1 -
 pengine/test10/stonith-1.summary                   |  11 +-
 pengine/test10/stonith-2.exp                       |  41 ++-
 pengine/test10/stonith-2.scores                    |   1 -
 pengine/test10/stonith-2.summary                   |   3 +-
 pengine/test10/stonith-3.scores                    |   1 -
 pengine/test10/stonith-3.summary                   |   3 +-
 pengine/test10/stonith-4.exp                       |  68 ++---
 pengine/test10/stonith-4.scores                    |   4 -
 pengine/test10/stonith-4.summary                   |  12 +-
 pengine/test10/stop-failure-no-quorum.exp          |  50 +--
 pengine/test10/stop-failure-no-quorum.scores       |   1 -
 pengine/test10/stop-failure-no-quorum.summary      |   5 +-
 pengine/test10/stop-failure-with-fencing.exp       |  52 ++--
 pengine/test10/stop-failure-with-fencing.scores    |   1 -
 pengine/test10/stop-failure-with-fencing.summary   |   5 +-
 pengine/test10/systemhealth1.scores                |   2 -
 pengine/test10/systemhealth1.summary               |   6 +-
 pengine/test10/systemhealth2.scores                |   1 -
 pengine/test10/systemhealth2.summary               |   3 +-
 pengine/test10/systemhealth3.scores                |   1 -
 pengine/test10/systemhealth3.summary               |   3 +-
 pengine/test10/systemhealthm1.scores               |   2 -
 pengine/test10/systemhealthm1.summary              |   6 +-
 pengine/test10/systemhealthm2.scores               |   1 -
 pengine/test10/systemhealthm2.summary              |   3 +-
 pengine/test10/systemhealthm3.scores               |   1 -
 pengine/test10/systemhealthm3.summary              |   3 +-
 pengine/test10/systemhealthn1.scores               |   2 -
 pengine/test10/systemhealthn1.summary              |   6 +-
 pengine/test10/systemhealthn2.scores               |   1 -
 pengine/test10/systemhealthn2.summary              |   3 +-
 pengine/test10/systemhealthn3.scores               |   1 -
 pengine/test10/systemhealthn3.summary              |   3 +-
 pengine/test10/systemhealtho1.scores               |   2 -
 pengine/test10/systemhealtho1.summary              |   6 +-
 pengine/test10/systemhealtho2.scores               |   1 -
 pengine/test10/systemhealtho2.summary              |   3 +-
 pengine/test10/systemhealtho3.scores               |   1 -
 pengine/test10/systemhealtho3.summary              |   3 +-
 pengine/test10/systemhealthp1.scores               |   2 -
 pengine/test10/systemhealthp1.summary              |   6 +-
 pengine/test10/systemhealthp2.scores               |   1 -
 pengine/test10/systemhealthp2.summary              |   3 +-
 pengine/test10/systemhealthp3.scores               |   1 -
 pengine/test10/systemhealthp3.summary              |   3 +-
 pengine/test10/ticket-clone-21.exp                 |  97 +++---
 pengine/test10/ticket-clone-21.scores              |   2 -
 pengine/test10/ticket-clone-21.summary             |   8 +-
 pengine/test10/ticket-clone-9.exp                  |  97 +++---
 pengine/test10/ticket-clone-9.scores               |   2 -
 pengine/test10/ticket-clone-9.summary              |   8 +-
 pengine/test10/ticket-group-21.exp                 |  63 ++--
 pengine/test10/ticket-group-21.scores              |   1 -
 pengine/test10/ticket-group-21.summary             |   5 +-
 pengine/test10/ticket-group-9.exp                  |  63 ++--
 pengine/test10/ticket-group-9.scores               |   1 -
 pengine/test10/ticket-group-9.summary              |   5 +-
 pengine/test10/ticket-master-21.exp                |  77 +++--
 pengine/test10/ticket-master-21.scores             |   1 -
 pengine/test10/ticket-master-21.summary            |   5 +-
 pengine/test10/ticket-master-9.exp                 |  77 +++--
 pengine/test10/ticket-master-9.scores              |   1 -
 pengine/test10/ticket-master-9.summary             |   5 +-
 pengine/test10/ticket-primitive-21.exp             |  39 ++-
 pengine/test10/ticket-primitive-21.scores          |   1 -
 pengine/test10/ticket-primitive-21.summary         |   5 +-
 pengine/test10/ticket-primitive-9.exp              |  39 ++-
 pengine/test10/ticket-primitive-9.scores           |   1 -
 pengine/test10/ticket-primitive-9.summary          |   5 +-
 pengine/test10/unfence-definition.scores           |   3 -
 pengine/test10/unfence-definition.summary          |   9 +-
 pengine/test10/unfence-parameters.scores           |   4 -
 pengine/test10/unfence-parameters.summary          |  12 +-
 pengine/test10/unfence-startup.scores              |   2 -
 pengine/test10/unfence-startup.summary             |   6 +-
 pengine/test10/unrunnable-1.exp                    |  28 +-
 pengine/test10/whitebox-fail1.scores               |   1 -
 pengine/test10/whitebox-fail1.summary              |   3 +-
 pengine/test10/whitebox-fail2.scores               |   1 -
 pengine/test10/whitebox-fail2.summary              |   3 +-
 pengine/test10/whitebox-imply-stop-on-fence.exp    | 212 ++++++-------
 pengine/test10/whitebox-imply-stop-on-fence.scores |   3 -
 .../test10/whitebox-imply-stop-on-fence.summary    |   9 +-
 pengine/test10/whitebox-ms-ordering.scores         |   2 -
 pengine/test10/whitebox-ms-ordering.summary        |   6 +-
 .../test10/whitebox-unexpectedly-running.scores    |   1 -
 .../test10/whitebox-unexpectedly-running.summary   |   3 +-
 210 files changed, 3715 insertions(+), 3945 deletions(-)

diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h
index 3e10a30..99e2055 100644
--- a/include/crm/pengine/internal.h
+++ b/include/crm/pengine/internal.h
@@ -277,6 +277,9 @@ action_t *pe_fence_op(node_t * node, const char *op, bool optional, const char *
 void trigger_unfencing(
     resource_t * rsc, node_t *node, const char *reason, action_t *dependency, pe_working_set_t * data_set);
 
+void pe_action_required_worker(pe_action_t *action, const char *reason, const char *function, long line);
+#define pe_action_required(action, reason) pe_action_required_worker(action, reason, __FUNCTION__, __LINE__)
+
 void set_bit_recursive(resource_t * rsc, unsigned long long flag);
 void clear_bit_recursive(resource_t * rsc, unsigned long long flag);
 
diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
index cfb7d97..d9e8354 100644
--- a/include/crm/pengine/status.h
+++ b/include/crm/pengine/status.h
@@ -323,6 +323,7 @@ struct pe_action_s {
 
     char *task;
     char *uuid;
+    char *reason;
     char *cancel_task;
 
     enum pe_action_flags flags;
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
index 629c557..299f9f6 100644
--- a/lib/pengine/unpack.c
+++ b/lib/pengine/unpack.c
@@ -121,6 +121,7 @@ pe_fence_node(pe_working_set_t * data_set, node_t * node, const char *reason)
                      reason);
         }
         node->details->unclean = TRUE;
+        pe_fence_op(node, NULL, TRUE, reason, data_set);
 
     } else if (node->details->unclean) {
         crm_trace("Cluster node %s %s because %s",
@@ -134,6 +135,7 @@ pe_fence_node(pe_working_set_t * data_set, node_t * node, const char *reason)
                  pe_can_fence(data_set, node)? "will be fenced" : "is unclean",
                  reason);
         node->details->unclean = TRUE;
+        pe_fence_op(node, NULL, TRUE, reason, data_set);
     }
 }
 
diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
index 5d2a1b9..a53be6a 100644
--- a/lib/pengine/utils.c
+++ b/lib/pengine/utils.c
@@ -1207,6 +1207,7 @@ pe_free_action(action_t * action)
         g_hash_table_destroy(action->meta);
     }
     free(action->cancel_task);
+    free(action->reason);
     free(action->task);
     free(action->uuid);
     free(action->node);
@@ -2088,7 +2089,6 @@ pe_fence_op(node_t * node, const char *op, bool optional, const char *reason, pe
                         /* Extra detail for those running from the commandline */
                         fprintf(stdout, "  notice: Unfencing %s (remote): because the definition of %s changed\n", node->details->uname, match->id);
                     }
-
                 }
 
                 digests_all_offset += snprintf(
@@ -2107,20 +2107,10 @@ pe_fence_op(node_t * node, const char *op, bool optional, const char *reason, pe
         free(op_key);
     }
 
-    if(optional == FALSE && is_set(stonith_op->flags, pe_action_optional)) {
-        const char *kind = "Fencing  ";
-
-        pe_clear_action_bit(stonith_op, pe_action_optional);
-
-        if(safe_str_eq(op, "on")) {
-            kind = "Unfencing";
-        }
-
-        crm_notice("%s %s: %s", kind, node->details->uname, reason);
-        if (is_set(data_set->flags, pe_flag_sanitized)) {
-            /* Extra detail for those running from the commandline */
-            fprintf(stdout, "  notice: %s %s: %s\n", kind, node->details->uname, reason);
-        }
+    if(optional == FALSE && pe_can_fence(data_set, node)) {
+        pe_action_required(stonith_op, reason);
+    } else if(reason && stonith_op->reason == NULL) {
+        stonith_op->reason = strdup(reason);
     }
 
     return stonith_op;
@@ -2196,3 +2186,13 @@ add_tag_ref(GHashTable * tags, const char * tag_name,  const char * obj_ref)
 
     return TRUE;
 }
+
+void pe_action_required_worker(pe_action_t *action, const char *reason, const char *function, long line) 
+{
+    if(is_set(action->flags, pe_action_optional)) {
+        action->flags = crm_clear_bit(function, line, action->uuid, action->flags, pe_action_optional);
+        if(action->reason == NULL) {
+            action->reason = strdup(reason);
+        }
+    }
+}
diff --git a/pengine/allocate.c b/pengine/allocate.c
index fd9c4f9..ef26245 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -1486,9 +1486,8 @@ stage6(pe_working_set_t * data_set)
         if (node->details->unclean
             && need_stonith && pe_can_fence(data_set, node)) {
 
-            pe_warn("Scheduling Node %s for STONITH", node->details->uname);
-
             stonith_op = pe_fence_op(node, NULL, FALSE, "node is unclean", data_set);
+            pe_warn("Scheduling Node %s for STONITH", node->details->uname);
 
             stonith_constraints(node, stonith_op, data_set);
 
@@ -2434,6 +2433,7 @@ LogNodeActions(pe_working_set_t * data_set, gboolean terminal)
             node_name = crm_strdup_printf("%s", action->node->details->uname);
         }
 
+
         if (safe_str_eq(action->task, CRM_OP_SHUTDOWN)) {
             task = strdup("Shutdown");
         } else if (safe_str_eq(action->task, CRM_OP_FENCE)) {
@@ -2443,8 +2443,12 @@ LogNodeActions(pe_working_set_t * data_set, gboolean terminal)
 
         if(task == NULL) {
             /* Nothing to report */
+        } else if(terminal && action->reason) {
+            printf(" * %s %s '%s'\n", task, node_name, action->reason);
         } else if(terminal) {
             printf(" * %s %s\n", task, node_name);
+        } else if(action->reason) {
+            crm_notice(" * %s %s '%s'\n", task, node_name, action->reason);
         } else {
             crm_notice(" * %s %s\n", task, node_name);
         }
diff --git a/pengine/native.c b/pengine/native.c
index bc59405..16c9d5a 100644
--- a/pengine/native.c
+++ b/pengine/native.c
@@ -1355,7 +1355,7 @@ native_internal_constraints(resource_t * rsc, pe_working_set_t * data_set)
 
         g_hash_table_iter_init(&iter, rsc->allowed_nodes);
         while (g_hash_table_iter_next(&iter, NULL, (void **)&node)) {
-            action_t *unfence = pe_fence_op(node, "on", TRUE, __FUNCTION__, data_set);
+            action_t *unfence = pe_fence_op(node, "on", TRUE, NULL, data_set);
 
             crm_debug("Ordering any stops of %s before %s, and any starts after",
                       rsc->id, unfence->uuid);
@@ -2457,7 +2457,7 @@ StopRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t * d
         }
 
         if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-            action_t *unfence = pe_fence_op(current, "on", TRUE, __FUNCTION__, data_set);
+            action_t *unfence = pe_fence_op(current, "on", TRUE, NULL, data_set);
             const char *unfenced = g_hash_table_lookup(current->details->attrs, XML_NODE_IS_UNFENCED);
 
             order_actions(stop, unfence, pe_order_implies_first);
@@ -2480,7 +2480,7 @@ StartRsc(resource_t * rsc, node_t * next, gboolean optional, pe_working_set_t *
     start = start_action(rsc, next, TRUE);
 
     if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-        action_t *unfence = pe_fence_op(next, "on", TRUE, __FUNCTION__, data_set);
+        action_t *unfence = pe_fence_op(next, "on", TRUE, NULL, data_set);
         const char *unfenced = g_hash_table_lookup(next->details->attrs, XML_NODE_IS_UNFENCED);
 
         order_actions(unfence, start, pe_order_implies_then);
@@ -2847,7 +2847,7 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
      * unfencing and that unfencing occurred.
      */
     if(is_set(rsc->flags, pe_rsc_needs_unfencing)) {
-        action_t *unfence = pe_fence_op(node, "on", TRUE, __FUNCTION__, data_set);
+        action_t *unfence = pe_fence_op(node, "on", TRUE, NULL, data_set);
         order_actions(unfence, probe, pe_order_optional);
     }
 
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
index 5d58ab4..400a5e7 100644
--- a/pengine/test10/594.exp
+++ b/pengine/test10/594.exp
@@ -1,52 +1,52 @@
 <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="16" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="17" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="15" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="16" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="15" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="16" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="10" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
       <trigger>
-        <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="15" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <rsc_op id="15" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="10" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="10" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
@@ -55,7 +55,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <rsc_op id="13" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.21"/>
       </rsc_op>
@@ -64,52 +64,52 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="rsc_hadev2_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="22" operation="monitor" operation_key="rsc_hadev2_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="21" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="20" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="21" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="11" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="20" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <rsc_op id="20" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="11" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="11" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
@@ -118,23 +118,23 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <rsc_op id="25" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
@@ -143,20 +143,20 @@
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+      <rsc_op id="28" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
@@ -165,25 +165,25 @@
   </synapse>
   <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="31" operation="stopped" operation_key="DoFencing_stopped_0">
+      <pseudo_event id="32" operation="stopped" operation_key="DoFencing_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="25" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="28" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="30" operation="stop" operation_key="DoFencing_stop_0">
+      <pseudo_event id="31" operation="stop" operation_key="DoFencing_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -191,18 +191,7 @@
   </synapse>
   <synapse id="15">
     <action_set>
-      <crm_event id="34" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
-        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="879e65f8-4b38-4c56-9552-4752ad436669"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <crm_event id="33" operation="do_shutdown" operation_key="do_shutdown-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+      <crm_event id="34" operation="do_shutdown" operation_key="do_shutdown-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
@@ -211,51 +200,61 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="15" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="20" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="25" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
+  <synapse id="16">
     <action_set>
-      <pseudo_event id="32" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="34" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="18">
+  <synapse id="17">
     <action_set>
-      <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="9" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="15" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="20" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+        <rsc_op id="25" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
       </trigger>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+        <rsc_op id="28" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="18">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-hadev3-reboot" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="879e65f8-4b38-4c56-9552-4752ad436669"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/594.scores b/pengine/test10/594.scores
index 430550c..972b89b 100644
--- a/pengine/test10/594.scores
+++ b/pengine/test10/594.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   hadev3: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on hadev1: 0
 clone_color: DoFencing allocation score on hadev2: 0
diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary
index 6cd78d3..44ed113 100644
--- a/pengine/test10/594.summary
+++ b/pengine/test10/594.summary
@@ -12,10 +12,9 @@ Online: [ hadev1 hadev2 ]
      child_DoFencing:1	(stonith:ssh):	Started hadev1
      child_DoFencing:2	(stonith:ssh):	Started hadev1
 
-  notice: Fencing   hadev3: node is unclean
 Transition Summary:
- * Fence (reboot) hadev3
  * Shutdown hadev2
+ * Fence (reboot) hadev3 'peer is no longer part of the cluster'
  * Move    DcIPaddr	(Started hadev2 -> hadev1)
  * Move    rsc_hadev2	(Started hadev2 -> hadev1)
  * Stop    child_DoFencing:0	(hadev2)
@@ -29,13 +28,13 @@ Executing cluster transition:
  * Resource action: child_DoFencing:2 monitor on hadev2
  * Pseudo action:   DoFencing_stop_0
  * Fencing hadev3 (reboot)
- * Pseudo action:   stonith_complete
  * Resource action: DcIPaddr        stop on hadev2
  * Resource action: rsc_hadev2      stop on hadev2
  * Resource action: child_DoFencing:0 stop on hadev2
  * Resource action: child_DoFencing:2 stop on hadev1
  * Pseudo action:   DoFencing_stopped_0
  * Cluster action:  do_shutdown on hadev2
+ * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
  * Resource action: DcIPaddr        start on hadev1
  * Resource action: rsc_hadev2      start on hadev1
diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp
index 51f64cb..4b83374 100644
--- a/pengine/test10/797.exp
+++ b/pengine/test10/797.exp
@@ -1,7 +1,7 @@
  <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
    <synapse id="0">
      <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
@@ -10,7 +10,7 @@
    </synapse>
    <synapse id="1">
      <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
@@ -19,49 +19,49 @@
   </synapse>
   <synapse id="2">
     <action_set>
-       <rsc_op id="11" operation="delete" operation_key="DcIPaddr_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="12" operation="delete" operation_key="DcIPaddr_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="10" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="11" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-      <rsc_op id="10" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="11" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
-      <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="27" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="14" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="22" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
@@ -70,7 +70,7 @@
    </synapse>
    <synapse id="6">
      <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="14" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
@@ -79,23 +79,23 @@
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="29" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="30" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="15" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="8">
      <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
@@ -104,7 +104,7 @@
    </synapse>
   <synapse id="9">
      <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="15" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
@@ -113,20 +113,20 @@
    </synapse>
   <synapse id="10">
      <action_set>
-      <rsc_op id="32" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="33" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="16" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
      <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="20" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
@@ -135,7 +135,7 @@
    </synapse>
   <synapse id="12">
      <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="16" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
@@ -144,20 +144,20 @@
    </synapse>
   <synapse id="13">
      <action_set>
-      <rsc_op id="34" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="35" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="14">
      <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
@@ -166,78 +166,78 @@
    </synapse>
    <synapse id="15">
      <action_set>
-      <rsc_op id="38" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="39" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-        <pseudo_event id="42" operation="start" operation_key="DoFencing_start_0"/>
+        <pseudo_event id="43" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
-      <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="38" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
-      <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="6" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="38" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="39" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
-      <rsc_op id="39" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="40" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
-      <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
@@ -246,7 +246,7 @@
    </synapse>
    <synapse id="21">
      <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
@@ -255,7 +255,7 @@
    </synapse>
    <synapse id="22">
      <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
@@ -264,7 +264,7 @@
    </synapse>
    <synapse id="23">
      <action_set>
-      <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
@@ -273,28 +273,28 @@
    </synapse>
   <synapse id="24" priority="1000000">
      <action_set>
-      <pseudo_event id="45" operation="stopped" operation_key="DoFencing_stopped_0">
+      <pseudo_event id="46" operation="stopped" operation_key="DoFencing_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-        <rsc_op id="39" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="40" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="25">
      <action_set>
-      <pseudo_event id="44" operation="stop" operation_key="DoFencing_stop_0">
+      <pseudo_event id="45" operation="stop" operation_key="DoFencing_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
@@ -302,46 +302,46 @@
    </synapse>
   <synapse id="26" priority="1000000">
      <action_set>
-      <pseudo_event id="43" operation="running" operation_key="DoFencing_running_0">
+      <pseudo_event id="44" operation="running" operation_key="DoFencing_running_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="38" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="39" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-        <pseudo_event id="42" operation="start" operation_key="DoFencing_start_0"/>
+        <pseudo_event id="43" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="27">
      <action_set>
-      <pseudo_event id="42" operation="start" operation_key="DoFencing_start_0">
+      <pseudo_event id="43" operation="start" operation_key="DoFencing_start_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stopped" operation_key="DoFencing_stopped_0"/>
+        <pseudo_event id="46" operation="stopped" operation_key="DoFencing_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="28">
      <action_set>
-      <crm_event id="47" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <crm_event id="48" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
@@ -350,46 +350,46 @@
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="27" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-        <rsc_op id="29" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="30" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-        <rsc_op id="39" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="40" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="29">
      <action_set>
-      <pseudo_event id="9" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="10" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="10" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="11" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="27" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-        <rsc_op id="29" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="30" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-        <rsc_op id="32" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="33" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="35" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
       <trigger>
-        <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="39" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="40" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
      </inputs>
    </synapse>
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
index 115a39f..d1f85fa 100644
--- a/pengine/test10/829.exp
+++ b/pengine/test10/829.exp
@@ -1,7 +1,7 @@
 <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="17" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
@@ -10,7 +10,7 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="10" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
@@ -19,7 +19,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="17" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="18" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
@@ -28,7 +28,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="11" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
@@ -37,66 +37,66 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="32" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="33" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="31" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="32" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="31" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="32" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="12" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="19" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="rsc_c001n02_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="rsc_c001n02_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="30" operation="stop" operation_key="rsc_c001n02_stop_0">
+      <pseudo_event id="31" operation="stop" operation_key="rsc_c001n02_stop_0">
         <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="12" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="19" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
@@ -105,7 +105,7 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="19" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
@@ -114,7 +114,7 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="12" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
@@ -123,7 +123,7 @@
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="24" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
@@ -132,7 +132,7 @@
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="13" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
@@ -141,7 +141,7 @@
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="25" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
@@ -150,7 +150,7 @@
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="20" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
@@ -159,25 +159,25 @@
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="37" operation="stop" operation_key="child_DoFencing:0_stop_0">
+      <pseudo_event id="38" operation="stop" operation_key="child_DoFencing:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="46" operation="stop" operation_key="DoFencing_stop_0"/>
+        <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <pseudo_event id="47" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -186,7 +186,7 @@
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -195,7 +195,7 @@
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -204,7 +204,7 @@
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -213,7 +213,7 @@
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -222,7 +222,7 @@
   </synapse>
   <synapse id="20">
     <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
@@ -231,71 +231,70 @@
   </synapse>
   <synapse id="21" priority="1000000">
     <action_set>
-      <pseudo_event id="47" operation="stopped" operation_key="DoFencing_stopped_0">
+      <pseudo_event id="48" operation="stopped" operation_key="DoFencing_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="46" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="47" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="46" operation="stop" operation_key="DoFencing_stop_0">
+      <pseudo_event id="47" operation="stop" operation_key="DoFencing_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
-        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="24">
-    <action_set>
-      <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="25">
+  <synapse id="24">
     <action_set>
-      <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="9" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="rsc_c001n02_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="rsc_c001n02_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="25">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/829.scores b/pengine/test10/829.scores
index 71a372b..f0652ff 100644
--- a/pengine/test10/829.scores
+++ b/pengine/test10/829.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c001n02: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/829.summary b/pengine/test10/829.summary
index 8649ed8..9e66733 100644
--- a/pengine/test10/829.summary
+++ b/pengine/test10/829.summary
@@ -14,9 +14,8 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:2	(stonith:ssh):	Started c001n01
      child_DoFencing:3	(stonith:ssh):	Started c001n08
 
-  notice: Fencing   c001n02: node is unclean
 Transition Summary:
- * Fence (reboot) c001n02
+ * Fence (reboot) c001n02 'peer is no longer part of the cluster'
  * Move    rsc_c001n02	(Started c001n02 -> c001n01)
  * Stop    child_DoFencing:0	(c001n02)
 
@@ -39,9 +38,9 @@ Executing cluster transition:
  * Resource action: child_DoFencing:3 monitor on c001n03
  * Resource action: child_DoFencing:3 monitor on c001n01
  * Fencing c001n02 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc_c001n02_stop_0
  * Pseudo action:   DoFencing_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: rsc_c001n02     start on c001n01
  * Pseudo action:   child_DoFencing:0_stop_0
  * Pseudo action:   DoFencing_stopped_0
diff --git a/pengine/test10/bug-5186-partial-migrate.exp b/pengine/test10/bug-5186-partial-migrate.exp
index bba083e..d9e806f 100644
--- a/pengine/test10/bug-5186-partial-migrate.exp
+++ b/pengine/test10/bug-5186-partial-migrate.exp
@@ -1,79 +1,79 @@
 <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="14" operation="start" operation_key="prmDummy_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="15" operation="start" operation_key="prmDummy_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmDummy" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="prmDummy_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="prmDummy_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="71" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="72" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <pseudo_event id="13" operation="stop" operation_key="prmDummy_stop_0">
+      <pseudo_event id="14" operation="stop" operation_key="prmDummy_stop_0">
         <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="17" operation="monitor" operation_key="prmVM2_monitor_10000" on_node="bl460g1n8" on_node_uuid="3232261594">
+      <rsc_op id="18" operation="monitor" operation_key="prmVM2_monitor_10000" on_node="bl460g1n8" on_node_uuid="3232261594">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n8" CRM_meta_on_node_uuid="3232261594" CRM_meta_record_pending="true" CRM_meta_timeout="30000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="16" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594"/>
+        <rsc_op id="17" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="16" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594">
+      <rsc_op id="17" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n8" CRM_meta_on_node_uuid="3232261594" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="2" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
       <trigger>
-        <pseudo_event id="15" operation="stop" operation_key="prmVM2_stop_0"/>
+        <pseudo_event id="16" operation="stop" operation_key="prmVM2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="71" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="72" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="15" operation="stop" operation_key="prmVM2_stop_0">
+      <pseudo_event id="16" operation="stop" operation_key="prmVM2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="2" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
@@ -82,25 +82,25 @@
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="43" operation="stopped" operation_key="grpStonith8_stopped_0">
+      <pseudo_event id="44" operation="stopped" operation_key="grpStonith8_stopped_0">
         <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="prmStonith8-1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="prmStonith8-2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="grpStonith8_stop_0"/>
+        <pseudo_event id="43" operation="stop" operation_key="grpStonith8_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="42" operation="stop" operation_key="grpStonith8_stop_0">
+      <pseudo_event id="43" operation="stop" operation_key="grpStonith8_stop_0">
         <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -108,305 +108,305 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="41" operation="running" operation_key="grpStonith8_running_0">
+      <pseudo_event id="42" operation="running" operation_key="grpStonith8_running_0">
         <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="36" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="39" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="grpStonith8_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="grpStonith8_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="40" operation="start" operation_key="grpStonith8_start_0">
+      <pseudo_event id="41" operation="start" operation_key="grpStonith8_start_0">
         <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="43" operation="stopped" operation_key="grpStonith8_stopped_0"/>
+        <pseudo_event id="44" operation="stopped" operation_key="grpStonith8_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="36" operation="monitor" operation_key="prmStonith8-1_monitor_10000" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="37" operation="monitor" operation_key="prmStonith8-1_monitor_10000" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="36" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="35" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="36" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
         <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="prmStonith8-1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="grpStonith8_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="grpStonith8_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="34" operation="stop" operation_key="prmStonith8-1_stop_0">
+      <pseudo_event id="35" operation="stop" operation_key="prmStonith8-1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="prmStonith8-2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="grpStonith8_stop_0"/>
+        <pseudo_event id="43" operation="stop" operation_key="grpStonith8_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="39" operation="monitor" operation_key="prmStonith8-2_monitor_3600000" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="40" operation="monitor" operation_key="prmStonith8-2_monitor_3600000" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="39" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="38" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
+      <rsc_op id="39" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="36" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="prmStonith8-2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="grpStonith8_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="grpStonith8_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="37" operation="stop" operation_key="prmStonith8-2_stop_0">
+      <pseudo_event id="38" operation="stop" operation_key="prmStonith8-2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="grpStonith8_stop_0"/>
+        <pseudo_event id="43" operation="stop" operation_key="grpStonith8_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="44" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0">
+      <pseudo_event id="45" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  device="/dev/mapper/lun1" interval="10" name="diskcheck_status" options="-e"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="51" operation="stop" operation_key="clnDiskd1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <pseudo_event id="52" operation="stop" operation_key="clnDiskd1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17" priority="1000000">
     <action_set>
-      <pseudo_event id="52" operation="stopped" operation_key="clnDiskd1_stopped_0">
+      <pseudo_event id="53" operation="stopped" operation_key="clnDiskd1_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="51" operation="stop" operation_key="clnDiskd1_stop_0"/>
+        <pseudo_event id="52" operation="stop" operation_key="clnDiskd1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="51" operation="stop" operation_key="clnDiskd1_stop_0">
+      <pseudo_event id="52" operation="stop" operation_key="clnDiskd1_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <pseudo_event id="53" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0">
+      <pseudo_event id="54" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  interval="10" name="diskcheck_status_internal" write_dir="/tmp/tmp2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="60" operation="stop" operation_key="clnDiskd2_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <pseudo_event id="61" operation="stop" operation_key="clnDiskd2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="61" operation="stopped" operation_key="clnDiskd2_stopped_0">
+      <pseudo_event id="62" operation="stopped" operation_key="clnDiskd2_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="53" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="60" operation="stop" operation_key="clnDiskd2_stop_0"/>
+        <pseudo_event id="61" operation="stop" operation_key="clnDiskd2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="60" operation="stop" operation_key="clnDiskd2_stop_0">
+      <pseudo_event id="61" operation="stop" operation_key="clnDiskd2_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="62" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0">
+      <pseudo_event id="63" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_record_pending="true" CRM_meta_timeout="60000" attempts="2"  host_list="192.168.201.254" multiplier="100" name="default_ping_set" timeout="2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="69" operation="stop" operation_key="clnPing_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <pseudo_event id="70" operation="stop" operation_key="clnPing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23" priority="1000000">
     <action_set>
-      <pseudo_event id="70" operation="stopped" operation_key="clnPing_stopped_0">
+      <pseudo_event id="71" operation="stopped" operation_key="clnPing_stopped_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="62" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
+        <pseudo_event id="63" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="69" operation="stop" operation_key="clnPing_stop_0"/>
+        <pseudo_event id="70" operation="stop" operation_key="clnPing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="69" operation="stop" operation_key="clnPing_stop_0">
+      <pseudo_event id="70" operation="stop" operation_key="clnPing_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593">
-        <attributes CRM_meta_default_ping_set="100" CRM_meta_diskcheck_status="normal" CRM_meta_diskcheck_status_internal="normal" CRM_meta_on_node="bl460g1n7" CRM_meta_on_node_uuid="3232261593" CRM_meta_probe_complete="true" CRM_meta_ringnumber_0="192.168.101.217 is UP" CRM_meta_ringnumber_1="192.168.102.217 is UP" CRM_meta_shutdown="0" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="3232261593"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="26">
-    <action_set>
-      <pseudo_event id="71" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="72" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="72" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="27">
+  <synapse id="26">
     <action_set>
-      <pseudo_event id="12" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="13" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
+        <rsc_op id="2" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="prmDummy_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="prmDummy_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="15" operation="stop" operation_key="prmVM2_stop_0"/>
+        <pseudo_event id="16" operation="stop" operation_key="prmVM2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="prmStonith8-1_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="prmStonith8-1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="prmStonith8-2_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="prmStonith8-2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="prmDiskd1_stop_0" internal_operation_key="prmDiskd1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="53" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="prmDiskd2_stop_0" internal_operation_key="prmDiskd2:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="62" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
+        <pseudo_event id="63" operation="stop" operation_key="prmPing_stop_0" internal_operation_key="prmPing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="71" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="72" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="27">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-bl460g1n7-reboot" on_node="bl460g1n7" on_node_uuid="3232261593">
+        <attributes CRM_meta_default_ping_set="100" CRM_meta_diskcheck_status="normal" CRM_meta_diskcheck_status_internal="normal" CRM_meta_on_node="bl460g1n7" CRM_meta_on_node_uuid="3232261593" CRM_meta_probe_complete="true" CRM_meta_ringnumber_0="192.168.101.217 is UP" CRM_meta_ringnumber_1="192.168.102.217 is UP" CRM_meta_shutdown="0" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="3232261593"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/pengine/test10/bug-5186-partial-migrate.scores b/pengine/test10/bug-5186-partial-migrate.scores
index dd59f34..8b29529 100644
--- a/pengine/test10/bug-5186-partial-migrate.scores
+++ b/pengine/test10/bug-5186-partial-migrate.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   bl460g1n7: node is unclean
 Allocation scores:
 clone_color: clnDiskd1 allocation score on bl460g1n6: 200
 clone_color: clnDiskd1 allocation score on bl460g1n7: 0
diff --git a/pengine/test10/bug-5186-partial-migrate.summary b/pengine/test10/bug-5186-partial-migrate.summary
index 5c8231d..c2685d8 100644
--- a/pengine/test10/bug-5186-partial-migrate.summary
+++ b/pengine/test10/bug-5186-partial-migrate.summary
@@ -24,9 +24,8 @@ Online: [ bl460g1n6 bl460g1n8 ]
      prmPing	(ocf::pacemaker:ping):	Started bl460g1n7 (UNCLEAN)
      Started: [ bl460g1n6 bl460g1n8 ]
 
-  notice: Fencing   bl460g1n7: node is unclean
 Transition Summary:
- * Fence (reboot) bl460g1n7
+ * Fence (reboot) bl460g1n7 'prmDummy is thought to be active there'
  * Move    prmDummy	(Started bl460g1n7 -> bl460g1n6)
  * Move    prmVM2	(Started bl460g1n7 -> bl460g1n8)
  * Move    prmStonith8-1	(Started bl460g1n7 -> bl460g1n6)
@@ -40,13 +39,13 @@ Executing cluster transition:
  * Pseudo action:   grpStonith8_stop_0
  * Pseudo action:   prmStonith8-2_stop_0
  * Fencing bl460g1n7 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   prmDummy_stop_0
  * Pseudo action:   prmVM2_stop_0
  * Pseudo action:   prmStonith8-1_stop_0
  * Pseudo action:   clnDiskd1_stop_0
  * Pseudo action:   clnDiskd2_stop_0
  * Pseudo action:   clnPing_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: prmDummy        start on bl460g1n6
  * Resource action: prmVM2          start on bl460g1n8
  * Pseudo action:   grpStonith8_stopped_0
diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp
index 6d0a2f4..344711b 100644
--- a/pengine/test10/bug-cl-5212.exp
+++ b/pengine/test10/bug-cl-5212.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="9" operation="stop" operation_key="grpStonith1_stop_0">
+      <pseudo_event id="11" operation="stop" operation_key="grpStonith1_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -9,7 +9,7 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <pseudo_event id="7" operation="start" operation_key="grpStonith1_start_0">
+      <pseudo_event id="9" operation="start" operation_key="grpStonith1_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -17,7 +17,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="16" operation="stop" operation_key="grpStonith2_stop_0">
+      <pseudo_event id="18" operation="stop" operation_key="grpStonith2_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -25,7 +25,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="14" operation="start" operation_key="grpStonith2_start_0">
+      <pseudo_event id="16" operation="start" operation_key="grpStonith2_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -33,7 +33,7 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="21" operation="stop" operation_key="grpStonith3_stop_0">
+      <pseudo_event id="23" operation="stop" operation_key="grpStonith3_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -41,78 +41,78 @@
   </synapse>
   <synapse id="5" priority="1000000">
     <action_set>
-      <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
+      <rsc_op id="74" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="2" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="38" operation="notify" operation_key="msPostgresql_post_notify_stopped_0"/>
+        <pseudo_event id="40" operation="notify" operation_key="msPostgresql_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
+      <rsc_op id="73" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="2" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
+        <pseudo_event id="38" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="39" operation="notified" operation_key="msPostgresql_confirmed-post_notify_stopped_0">
+      <pseudo_event id="41" operation="notified" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="38" operation="notify" operation_key="msPostgresql_post_notify_stopped_0"/>
+        <pseudo_event id="40" operation="notify" operation_key="msPostgresql_post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
+        <rsc_op id="74" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
-      <pseudo_event id="38" operation="notify" operation_key="msPostgresql_post_notify_stopped_0">
+      <pseudo_event id="40" operation="notify" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="35" operation="stopped" operation_key="msPostgresql_stopped_0"/>
+        <pseudo_event id="37" operation="stopped" operation_key="msPostgresql_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="39" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="37" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0">
+      <pseudo_event id="39" operation="notified" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
+        <pseudo_event id="38" operation="notify" operation_key="msPostgresql_pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
+        <rsc_op id="73" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="36" operation="notify" operation_key="msPostgresql_pre_notify_stop_0">
+      <pseudo_event id="38" operation="notify" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -120,43 +120,43 @@
   </synapse>
   <synapse id="11" priority="1000000">
     <action_set>
-      <pseudo_event id="35" operation="stopped" operation_key="msPostgresql_stopped_0">
+      <pseudo_event id="37" operation="stopped" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="msPostgresql_stop_0"/>
+        <pseudo_event id="36" operation="stop" operation_key="msPostgresql_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="34" operation="stop" operation_key="msPostgresql_stop_0">
+      <pseudo_event id="36" operation="stop" operation_key="msPostgresql_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_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="37" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="39" operation="notified" operation_key="msPostgresql_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="59" operation="stopped" operation_key="clnPingd_stopped_0">
+      <pseudo_event id="61" operation="stopped" operation_key="clnPingd_stopped_0">
         <attributes CRM_meta_clone_max="3" 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="58" operation="stop" operation_key="clnPingd_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="clnPingd_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="58" operation="stop" operation_key="clnPingd_stop_0">
+      <pseudo_event id="60" operation="stop" operation_key="clnPingd_stop_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
diff --git a/pengine/test10/bug-cl-5247.scores b/pengine/test10/bug-cl-5247.scores
index f1ded69..e9e4709 100644
--- a/pengine/test10/bug-cl-5247.scores
+++ b/pengine/test10/bug-cl-5247.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   pgsr02: guest is unclean
 Allocation scores:
 Using the original execution date of: 2015-08-12 02:53:40Z
 clone_color: msPostgresql allocation score on bl460g8n3: -INFINITY
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index 755e647..fc97e8d 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -17,9 +17,8 @@ Containers: [ pgsr01:prmDB1 ]
      Masters: [ pgsr01 ]
      Stopped: [ bl460g8n3 bl460g8n4 ]
 
-  notice: Fencing   pgsr02: guest is unclean
 Transition Summary:
- * Fence (off) pgsr02 (resource: prmDB2)
+ * Fence (off) pgsr02 (resource: prmDB2) 'guest is unclean'
  * Stop    prmDB2	(bl460g8n4)
  * Restart prmStonith1-2	(Started bl460g8n4)
  * Restart prmStonith2-2	(Started bl460g8n3)
diff --git a/pengine/test10/bug-lf-2508.exp b/pengine/test10/bug-lf-2508.exp
index bf70378..925afbc 100644
--- a/pengine/test10/bug-lf-2508.exp
+++ b/pengine/test10/bug-lf-2508.exp
@@ -1,22 +1,22 @@
 <transition_graph cluster-delay="60s" stonith-timeout="240s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <pseudo_event id="22" operation="running" operation_key="Group01_running_0">
+      <pseudo_event id="23" operation="running" operation_key="Group01_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="19" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
+        <rsc_op id="20" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
       </trigger>
       <trigger>
-        <pseudo_event id="21" operation="start" operation_key="Group01_start_0"/>
+        <pseudo_event id="22" operation="start" operation_key="Group01_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <pseudo_event id="21" operation="start" operation_key="Group01_start_0">
+      <pseudo_event id="22" operation="start" operation_key="Group01_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -24,317 +24,317 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="Dummy01_monitor_10000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
+      <rsc_op id="21" operation="monitor" operation_key="Dummy01_monitor_10000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="Dummy01" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="19" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
+        <rsc_op id="20" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="19" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
+      <rsc_op id="20" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="Dummy01" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="21" operation="start" operation_key="Group01_start_0"/>
+        <pseudo_event id="22" operation="start" operation_key="Group01_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="161" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="162" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="31" operation="stopped" operation_key="Group02_stopped_0">
+      <pseudo_event id="32" operation="stopped" operation_key="Group02_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="stop" operation_key="Dummy02_stop_0"/>
+        <pseudo_event id="26" operation="stop" operation_key="Dummy02_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="Group02_stop_0"/>
+        <pseudo_event id="31" operation="stop" operation_key="Group02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="30" operation="stop" operation_key="Group02_stop_0">
+      <pseudo_event id="31" operation="stop" operation_key="Group02_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="29" operation="running" operation_key="Group02_running_0">
+      <pseudo_event id="30" operation="running" operation_key="Group02_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="26" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62"/>
+        <rsc_op id="27" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62"/>
       </trigger>
       <trigger>
-        <pseudo_event id="28" operation="start" operation_key="Group02_start_0"/>
+        <pseudo_event id="29" operation="start" operation_key="Group02_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="28" operation="start" operation_key="Group02_start_0">
+      <pseudo_event id="29" operation="start" operation_key="Group02_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stopped" operation_key="Group02_stopped_0"/>
+        <pseudo_event id="32" operation="stopped" operation_key="Group02_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="27" operation="monitor" operation_key="Dummy02_monitor_10000" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
+      <rsc_op id="28" operation="monitor" operation_key="Dummy02_monitor_10000" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
         <primitive id="Dummy02" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="26" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62"/>
+        <rsc_op id="27" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="26" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
+      <rsc_op id="27" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
         <primitive id="Dummy02" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="stop" operation_key="Dummy02_stop_0"/>
+        <pseudo_event id="26" operation="stop" operation_key="Dummy02_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="28" operation="start" operation_key="Group02_start_0"/>
+        <pseudo_event id="29" operation="start" operation_key="Group02_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="161" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="162" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="25" operation="stop" operation_key="Dummy02_stop_0">
+      <pseudo_event id="26" operation="stop" operation_key="Dummy02_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="Group02_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="31" operation="stop" operation_key="Group02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="51" operation="stopped" operation_key="grpStonith1:1_stopped_0">
+      <pseudo_event id="52" operation="stopped" operation_key="grpStonith1:1_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="46" operation="stop" operation_key="prmStonith1-1:1_stop_0"/>
+        <pseudo_event id="47" operation="stop" operation_key="prmStonith1-1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="47" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
+        <pseudo_event id="48" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="grpStonith1:1_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="grpStonith1:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="50" operation="stop" operation_key="grpStonith1:1_stop_0">
+      <pseudo_event id="51" operation="stop" operation_key="grpStonith1:1_stop_0">
         <attributes CRM_meta_clone_max="4" 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="66" operation="stop" operation_key="clnStonith1_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="clnStonith1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13" priority="1">
     <action_set>
-      <pseudo_event id="46" operation="stop" operation_key="prmStonith1-1:1_stop_0">
+      <pseudo_event id="47" operation="stop" operation_key="prmStonith1-1:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  dead_check_target="192.168.40.10" hostlist="srv01" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="47" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="grpStonith1:1_stop_0"/>
+        <pseudo_event id="48" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="51" operation="stop" operation_key="grpStonith1:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14" priority="3">
     <action_set>
-      <pseudo_event id="47" operation="stop" operation_key="prmStonith1-3:1_stop_0">
+      <pseudo_event id="48" operation="stop" operation_key="prmStonith1-3:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  hostlist="srv01" priority="3" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="grpStonith1:1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="51" operation="stop" operation_key="grpStonith1:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15" priority="1000000">
     <action_set>
-      <pseudo_event id="67" operation="stopped" operation_key="clnStonith1_stopped_0">
+      <pseudo_event id="68" operation="stopped" operation_key="clnStonith1_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="51" operation="stopped" operation_key="grpStonith1:1_stopped_0"/>
+        <pseudo_event id="52" operation="stopped" operation_key="grpStonith1:1_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="66" operation="stop" operation_key="clnStonith1_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="clnStonith1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="66" operation="stop" operation_key="clnStonith1_stop_0">
+      <pseudo_event id="67" operation="stop" operation_key="clnStonith1_stop_0">
         <attributes CRM_meta_clone_max="4" 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>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="105" operation="stopped" operation_key="grpStonith3:0_stopped_0">
+      <pseudo_event id="106" operation="stopped" operation_key="grpStonith3:0_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="100" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0"/>
+        <pseudo_event id="101" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="101" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
+        <pseudo_event id="102" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="stop" operation_key="grpStonith3:0_stop_0"/>
+        <pseudo_event id="105" operation="stop" operation_key="grpStonith3:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="104" operation="stop" operation_key="grpStonith3:0_stop_0">
+      <pseudo_event id="105" operation="stop" operation_key="grpStonith3:0_stop_0">
         <attributes CRM_meta_clone_max="4" 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="129" operation="stop" operation_key="clnStonith3_stop_0"/>
+        <pseudo_event id="130" operation="stop" operation_key="clnStonith3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19" priority="1">
     <action_set>
-      <pseudo_event id="100" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0">
+      <pseudo_event id="101" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  dead_check_target="192.168.40.30" hostlist="srv03" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="101" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <pseudo_event id="104" operation="stop" operation_key="grpStonith3:0_stop_0"/>
+        <pseudo_event id="102" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="105" operation="stop" operation_key="grpStonith3:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20" priority="3">
     <action_set>
-      <pseudo_event id="101" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0">
+      <pseudo_event id="102" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="104" operation="stop" operation_key="grpStonith3:0_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="105" operation="stop" operation_key="grpStonith3:0_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="112" operation="running" operation_key="grpStonith3:1_running_0">
+      <pseudo_event id="113" operation="running" operation_key="grpStonith3:1_running_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="109" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
+        <rsc_op id="110" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="start" operation_key="grpStonith3:1_start_0"/>
+        <pseudo_event id="112" operation="start" operation_key="grpStonith3:1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="111" operation="start" operation_key="grpStonith3:1_start_0">
+      <pseudo_event id="112" operation="start" operation_key="grpStonith3:1_start_0">
         <attributes CRM_meta_clone_max="4" 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="127" operation="start" operation_key="clnStonith3_start_0"/>
+        <pseudo_event id="128" operation="start" operation_key="clnStonith3_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23" priority="1">
     <action_set>
-      <rsc_op id="108" operation="monitor" operation_key="prmStonith3-1:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
+      <rsc_op id="109" operation="monitor" operation_key="prmStonith3-1:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-1" long-id="prmStonith3-1:1" class="stonith" type="external/stonith-helper"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  dead_check_target="192.168.40.30" hostlist="srv03" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
       </rsc_op>
@@ -343,232 +343,231 @@
   </synapse>
   <synapse id="24" priority="3">
     <action_set>
-      <rsc_op id="110" operation="monitor" operation_key="prmStonith3-3:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
+      <rsc_op id="111" operation="monitor" operation_key="prmStonith3-3:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-3" long-id="prmStonith3-3:1" class="stonith" type="external/ssh"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="109" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
+        <rsc_op id="110" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25" priority="3">
     <action_set>
-      <rsc_op id="109" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
+      <rsc_op id="110" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-3" long-id="prmStonith3-3:1" class="stonith" type="external/ssh"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="19" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="111" operation="start" operation_key="grpStonith3:1_start_0"/>
+        <pseudo_event id="112" operation="start" operation_key="grpStonith3:1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26" priority="1000000">
     <action_set>
-      <pseudo_event id="130" operation="stopped" operation_key="clnStonith3_stopped_0">
+      <pseudo_event id="131" operation="stopped" operation_key="clnStonith3_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="stopped" operation_key="grpStonith3:0_stopped_0"/>
+        <pseudo_event id="106" operation="stopped" operation_key="grpStonith3:0_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="129" operation="stop" operation_key="clnStonith3_stop_0"/>
+        <pseudo_event id="130" operation="stop" operation_key="clnStonith3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="129" operation="stop" operation_key="clnStonith3_stop_0">
+      <pseudo_event id="130" operation="stop" operation_key="clnStonith3_stop_0">
         <attributes CRM_meta_clone_max="4" 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>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28" priority="1000000">
     <action_set>
-      <pseudo_event id="128" operation="running" operation_key="clnStonith3_running_0">
+      <pseudo_event id="129" operation="running" operation_key="clnStonith3_running_0">
         <attributes CRM_meta_clone_max="4" 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="112" operation="running" operation_key="grpStonith3:1_running_0"/>
+        <pseudo_event id="113" operation="running" operation_key="grpStonith3:1_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="127" operation="start" operation_key="clnStonith3_start_0"/>
+        <pseudo_event id="128" operation="start" operation_key="clnStonith3_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="127" operation="start" operation_key="clnStonith3_start_0">
+      <pseudo_event id="128" operation="start" operation_key="clnStonith3_start_0">
         <attributes CRM_meta_clone_max="4" 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="130" operation="stopped" operation_key="clnStonith3_stopped_0"/>
+        <pseudo_event id="131" operation="stopped" operation_key="clnStonith3_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="144" operation="stopped" operation_key="grpStonith4:1_stopped_0">
+      <pseudo_event id="145" operation="stopped" operation_key="grpStonith4:1_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="139" operation="stop" operation_key="prmStonith4-1:1_stop_0"/>
+        <pseudo_event id="140" operation="stop" operation_key="prmStonith4-1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="140" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
+        <pseudo_event id="141" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="143" operation="stop" operation_key="grpStonith4:1_stop_0"/>
+        <pseudo_event id="144" operation="stop" operation_key="grpStonith4:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="143" operation="stop" operation_key="grpStonith4:1_stop_0">
+      <pseudo_event id="144" operation="stop" operation_key="grpStonith4:1_stop_0">
         <attributes CRM_meta_clone_max="4" 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="159" operation="stop" operation_key="clnStonith4_stop_0"/>
+        <pseudo_event id="160" operation="stop" operation_key="clnStonith4_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32" priority="1">
     <action_set>
-      <pseudo_event id="139" operation="stop" operation_key="prmStonith4-1:1_stop_0">
+      <pseudo_event id="140" operation="stop" operation_key="prmStonith4-1:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  dead_check_target="192.168.40.40" hostlist="srv04" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="140" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <pseudo_event id="143" operation="stop" operation_key="grpStonith4:1_stop_0"/>
+        <pseudo_event id="141" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="144" operation="stop" operation_key="grpStonith4:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33" priority="3">
     <action_set>
-      <pseudo_event id="140" operation="stop" operation_key="prmStonith4-3:1_stop_0">
+      <pseudo_event id="141" operation="stop" operation_key="prmStonith4-3:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="60000"  hostlist="srv04" priority="3" stonith-timeout="60s"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="143" operation="stop" operation_key="grpStonith4:1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <pseudo_event id="144" operation="stop" operation_key="grpStonith4:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="34" priority="1000000">
     <action_set>
-      <pseudo_event id="160" operation="stopped" operation_key="clnStonith4_stopped_0">
+      <pseudo_event id="161" operation="stopped" operation_key="clnStonith4_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="144" operation="stopped" operation_key="grpStonith4:1_stopped_0"/>
+        <pseudo_event id="145" operation="stopped" operation_key="grpStonith4:1_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="159" operation="stop" operation_key="clnStonith4_stop_0"/>
+        <pseudo_event id="160" operation="stop" operation_key="clnStonith4_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="35">
     <action_set>
-      <pseudo_event id="159" operation="stop" operation_key="clnStonith4_stop_0">
+      <pseudo_event id="160" operation="stop" operation_key="clnStonith4_stop_0">
         <attributes CRM_meta_clone_max="4" 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>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="36">
     <action_set>
-      <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182">
-        <attributes CRM_meta_on_node="srv02" CRM_meta_on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="37">
-    <action_set>
-      <pseudo_event id="161" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="162" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="162" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="38">
+  <synapse id="37">
     <action_set>
-      <pseudo_event id="18" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="19" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="stop" operation_key="Dummy02_stop_0"/>
+        <pseudo_event id="26" operation="stop" operation_key="Dummy02_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="46" operation="stop" operation_key="prmStonith1-1:1_stop_0"/>
+        <pseudo_event id="47" operation="stop" operation_key="prmStonith1-1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="47" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
+        <pseudo_event id="48" operation="stop" operation_key="prmStonith1-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="100" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0"/>
+        <pseudo_event id="101" operation="stop" operation_key="prmStonith3-1:1_stop_0" internal_operation_key="prmStonith3-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="101" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
+        <pseudo_event id="102" operation="stop" operation_key="prmStonith3-3:1_stop_0" internal_operation_key="prmStonith3-3:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="139" operation="stop" operation_key="prmStonith4-1:1_stop_0"/>
+        <pseudo_event id="140" operation="stop" operation_key="prmStonith4-1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="140" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
+        <pseudo_event id="141" operation="stop" operation_key="prmStonith4-3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="161" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="162" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="38">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-srv02-reboot" on_node="srv02" on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182">
+        <attributes CRM_meta_on_node="srv02" CRM_meta_on_node_uuid="71085d5e-1c63-49e0-8c8c-400d610b4182" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="71085d5e-1c63-49e0-8c8c-400d610b4182"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/bug-lf-2508.scores b/pengine/test10/bug-lf-2508.scores
index 200d548..3c3ce16 100644
--- a/pengine/test10/bug-lf-2508.scores
+++ b/pengine/test10/bug-lf-2508.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   srv02: node is unclean
 Allocation scores:
 clone_color: clnStonith1 allocation score on srv01: -INFINITY
 clone_color: clnStonith1 allocation score on srv02: 0
diff --git a/pengine/test10/bug-lf-2508.summary b/pengine/test10/bug-lf-2508.summary
index 18080cb..ddaf1c3 100644
--- a/pengine/test10/bug-lf-2508.summary
+++ b/pengine/test10/bug-lf-2508.summary
@@ -34,9 +34,8 @@ Online: [ srv01 srv03 srv04 ]
      Started: [ srv01 srv03 ]
      Stopped: [ srv04 ]
 
-  notice: Fencing   srv02: node is unclean
 Transition Summary:
- * Fence (reboot) srv02
+ * Fence (reboot) srv02 'peer is no longer part of the cluster'
  * Start   Dummy01	(srv01)
  * Move    Dummy02	(Started srv02 -> srv04)
  * Stop    prmStonith1-1:1	(srv02)
@@ -51,15 +50,13 @@ Executing cluster transition:
  * Pseudo action:   Group01_start_0
  * Resource action: prmStonith3-1:1 monitor=3600000 on srv01
  * Fencing srv02 (reboot)
- * Pseudo action:   stonith_complete
- * Resource action: Dummy01         start on srv01
  * Pseudo action:   Group02_stop_0
  * Pseudo action:   Dummy02_stop_0
  * Pseudo action:   clnStonith1_stop_0
  * Pseudo action:   clnStonith3_stop_0
  * Pseudo action:   clnStonith4_stop_0
- * Pseudo action:   Group01_running_0
- * Resource action: Dummy01         monitor=10000 on srv01
+ * Pseudo action:   stonith_complete
+ * Resource action: Dummy01         start on srv01
  * Pseudo action:   Group02_stopped_0
  * Pseudo action:   Group02_start_0
  * Resource action: Dummy02         start on srv04
@@ -69,6 +66,8 @@ Executing cluster transition:
  * Pseudo action:   prmStonith3-3:1_stop_0
  * Pseudo action:   grpStonith4:1_stop_0
  * Pseudo action:   prmStonith4-3:1_stop_0
+ * Pseudo action:   Group01_running_0
+ * Resource action: Dummy01         monitor=10000 on srv01
  * Pseudo action:   Group02_running_0
  * Resource action: Dummy02         monitor=10000 on srv04
  * Pseudo action:   prmStonith1-1:1_stop_0
diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp
index f5b8236..a14ec5e 100644
--- a/pengine/test10/bug-lf-2551.exp
+++ b/pengine/test10/bug-lf-2551.exp
@@ -1,20 +1,20 @@
 <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="159" operation="start" operation_key="fencing-sbd_start_0" on_node="hex-0" on_node_uuid="hex-0">
+      <rsc_op id="160" operation="start" operation_key="fencing-sbd_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="fencing-sbd" class="stonith" type="external/sbd"/>
         <attributes CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  sbd_device="/dev/disk/by-id/dm-uuid-part1-mpath-3600508b400105b5a0001500000250000"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="158" operation="stop" operation_key="fencing-sbd_stop_0"/>
+        <pseudo_event id="159" operation="stop" operation_key="fencing-sbd_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <pseudo_event id="158" operation="stop" operation_key="fencing-sbd_stop_0">
+      <pseudo_event id="159" operation="stop" operation_key="fencing-sbd_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  sbd_device="/dev/disk/by-id/dm-uuid-part1-mpath-3600508b400105b5a0001500000250000"/>
       </pseudo_event>
     </action_set>
@@ -22,7 +22,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="164" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-8" on_node_uuid="hex-8">
+      <rsc_op id="165" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-8" on_node_uuid="hex-8">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_on_node="hex-8" CRM_meta_on_node_uuid="hex-8" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
       </rsc_op>
@@ -31,7 +31,7 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="163" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-7" on_node_uuid="hex-7">
+      <rsc_op id="164" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-7" on_node_uuid="hex-7">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_on_node="hex-7" CRM_meta_on_node_uuid="hex-7" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
       </rsc_op>
@@ -40,646 +40,645 @@
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="162" operation="monitor" operation_key="dummy1_monitor_30000" on_node="hex-0" on_node_uuid="hex-0">
+      <rsc_op id="163" operation="monitor" operation_key="dummy1_monitor_30000" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="10000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="161" operation="start" operation_key="dummy1_start_0" on_node="hex-0" on_node_uuid="hex-0"/>
+        <rsc_op id="162" operation="start" operation_key="dummy1_start_0" on_node="hex-0" on_node_uuid="hex-0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="161" operation="start" operation_key="dummy1_start_0" on_node="hex-0" on_node_uuid="hex-0">
+      <rsc_op id="162" operation="start" operation_key="dummy1_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="160" operation="stop" operation_key="dummy1_stop_0"/>
+        <pseudo_event id="161" operation="stop" operation_key="dummy1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="244" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="245" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="160" operation="stop" operation_key="dummy1_stop_0">
+      <pseudo_event id="161" operation="stop" operation_key="dummy1_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="223" operation="stopped" operation_key="base-group:3_stopped_0">
+      <pseudo_event id="224" operation="stopped" operation_key="base-group:3_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="214" operation="stop" operation_key="dlm:3_stop_0"/>
+        <pseudo_event id="215" operation="stop" operation_key="dlm:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="215" operation="stop" operation_key="o2cb:3_stop_0"/>
+        <pseudo_event id="216" operation="stop" operation_key="o2cb:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="216" operation="stop" operation_key="clvm:3_stop_0"/>
+        <pseudo_event id="217" operation="stop" operation_key="clvm:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="217" operation="stop" operation_key="cmirrord:3_stop_0"/>
+        <pseudo_event id="218" operation="stop" operation_key="cmirrord:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="218" operation="stop" operation_key="vg1:3_stop_0"/>
+        <pseudo_event id="219" operation="stop" operation_key="vg1:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="219" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
+        <pseudo_event id="220" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0">
+      <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="226" operation="stop" operation_key="base-clone_stop_0"/>
+        <pseudo_event id="227" operation="stop" operation_key="base-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="214" operation="stop" operation_key="dlm:3_stop_0">
+      <pseudo_event id="215" operation="stop" operation_key="dlm:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="215" operation="stop" operation_key="o2cb:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="216" operation="stop" operation_key="o2cb:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="215" operation="stop" operation_key="o2cb:3_stop_0">
+      <pseudo_event id="216" operation="stop" operation_key="o2cb:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="216" operation="stop" operation_key="clvm:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="217" operation="stop" operation_key="clvm:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="216" operation="stop" operation_key="clvm:3_stop_0">
+      <pseudo_event id="217" operation="stop" operation_key="clvm:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="30"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="217" operation="stop" operation_key="cmirrord:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="218" operation="stop" operation_key="cmirrord:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="217" operation="stop" operation_key="cmirrord:3_stop_0">
+      <pseudo_event id="218" operation="stop" operation_key="cmirrord:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="60"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="218" operation="stop" operation_key="vg1:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="219" operation="stop" operation_key="vg1:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <pseudo_event id="218" operation="stop" operation_key="vg1:3_stop_0">
+      <pseudo_event id="219" operation="stop" operation_key="vg1:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  volgrpname="cluster-vg"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="219" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <pseudo_event id="220" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <pseudo_event id="219" operation="stop" operation_key="ocfs2-1:3_stop_0">
+      <pseudo_event id="220" operation="stop" operation_key="ocfs2-1:3_stop_0">
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  device="/dev/cluster-vg/fs1" directory="/var/lib/xen/images" fstype="ocfs2" options="acl"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="222" operation="stop" operation_key="base-group:3_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="223" operation="stop" operation_key="base-group:3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15" priority="1000000">
     <action_set>
-      <pseudo_event id="227" operation="stopped" operation_key="base-clone_stopped_0">
+      <pseudo_event id="228" operation="stopped" operation_key="base-clone_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="223" operation="stopped" operation_key="base-group:3_stopped_0"/>
+        <pseudo_event id="224" operation="stopped" operation_key="base-group:3_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="226" operation="stop" operation_key="base-clone_stop_0"/>
+        <pseudo_event id="227" operation="stop" operation_key="base-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="226" operation="stop" operation_key="base-clone_stop_0">
+      <pseudo_event id="227" operation="stop" operation_key="base-clone_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="228" operation="stop" operation_key="vm-03_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
       <trigger>
-        <pseudo_event id="229" operation="stop" operation_key="vm-06_stop_0"/>
+        <pseudo_event id="229" operation="stop" operation_key="vm-03_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="230" operation="stop" operation_key="vm-09_stop_0"/>
+        <pseudo_event id="230" operation="stop" operation_key="vm-06_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="231" operation="stop" operation_key="vm-13_stop_0"/>
+        <pseudo_event id="231" operation="stop" operation_key="vm-09_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="232" operation="stop" operation_key="vm-17_stop_0"/>
+        <pseudo_event id="232" operation="stop" operation_key="vm-13_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="233" operation="stop" operation_key="vm-21_stop_0"/>
+        <pseudo_event id="233" operation="stop" operation_key="vm-17_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="234" operation="stop" operation_key="vm-25_stop_0"/>
+        <pseudo_event id="234" operation="stop" operation_key="vm-21_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="235" operation="stop" operation_key="vm-29_stop_0"/>
+        <pseudo_event id="235" operation="stop" operation_key="vm-25_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="236" operation="stop" operation_key="vm-33_stop_0"/>
+        <pseudo_event id="236" operation="stop" operation_key="vm-29_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="237" operation="stop" operation_key="vm-37_stop_0"/>
+        <pseudo_event id="237" operation="stop" operation_key="vm-33_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="238" operation="stop" operation_key="vm-41_stop_0"/>
+        <pseudo_event id="238" operation="stop" operation_key="vm-37_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="239" operation="stop" operation_key="vm-45_stop_0"/>
+        <pseudo_event id="239" operation="stop" operation_key="vm-41_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="240" operation="stop" operation_key="vm-49_stop_0"/>
+        <pseudo_event id="240" operation="stop" operation_key="vm-45_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="241" operation="stop" operation_key="vm-53_stop_0"/>
+        <pseudo_event id="241" operation="stop" operation_key="vm-49_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="242" operation="stop" operation_key="vm-57_stop_0"/>
+        <pseudo_event id="242" operation="stop" operation_key="vm-53_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="243" operation="stop" operation_key="vm-61_stop_0"/>
+        <pseudo_event id="243" operation="stop" operation_key="vm-57_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <pseudo_event id="244" operation="stop" operation_key="vm-61_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="228" operation="stop" operation_key="vm-03_stop_0">
+      <pseudo_event id="229" operation="stop" operation_key="vm-03_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-03" xmfile="/var/lib/xen/images/xm.vm-03"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="229" operation="stop" operation_key="vm-06_stop_0">
+      <pseudo_event id="230" operation="stop" operation_key="vm-06_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-06" xmfile="/var/lib/xen/images/xm.vm-06"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <pseudo_event id="230" operation="stop" operation_key="vm-09_stop_0">
+      <pseudo_event id="231" operation="stop" operation_key="vm-09_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-09" xmfile="/var/lib/xen/images/xm.vm-09"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <pseudo_event id="231" operation="stop" operation_key="vm-13_stop_0">
+      <pseudo_event id="232" operation="stop" operation_key="vm-13_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-13" xmfile="/var/lib/xen/images/xm.vm-13"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="232" operation="stop" operation_key="vm-17_stop_0">
+      <pseudo_event id="233" operation="stop" operation_key="vm-17_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-17" xmfile="/var/lib/xen/images/xm.vm-17"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="233" operation="stop" operation_key="vm-21_stop_0">
+      <pseudo_event id="234" operation="stop" operation_key="vm-21_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-21" xmfile="/var/lib/xen/images/xm.vm-21"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <pseudo_event id="234" operation="stop" operation_key="vm-25_stop_0">
+      <pseudo_event id="235" operation="stop" operation_key="vm-25_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-25" xmfile="/var/lib/xen/images/xm.vm-25"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="235" operation="stop" operation_key="vm-29_stop_0">
+      <pseudo_event id="236" operation="stop" operation_key="vm-29_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-29" xmfile="/var/lib/xen/images/xm.vm-29"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <pseudo_event id="236" operation="stop" operation_key="vm-33_stop_0">
+      <pseudo_event id="237" operation="stop" operation_key="vm-33_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-33" xmfile="/var/lib/xen/images/xm.vm-33"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <pseudo_event id="237" operation="stop" operation_key="vm-37_stop_0">
+      <pseudo_event id="238" operation="stop" operation_key="vm-37_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-37" xmfile="/var/lib/xen/images/xm.vm-37"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="238" operation="stop" operation_key="vm-41_stop_0">
+      <pseudo_event id="239" operation="stop" operation_key="vm-41_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-41" xmfile="/var/lib/xen/images/xm.vm-41"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="239" operation="stop" operation_key="vm-45_stop_0">
+      <pseudo_event id="240" operation="stop" operation_key="vm-45_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-45" xmfile="/var/lib/xen/images/xm.vm-45"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="240" operation="stop" operation_key="vm-49_stop_0">
+      <pseudo_event id="241" operation="stop" operation_key="vm-49_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-49" xmfile="/var/lib/xen/images/xm.vm-49"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="241" operation="stop" operation_key="vm-53_stop_0">
+      <pseudo_event id="242" operation="stop" operation_key="vm-53_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-53" xmfile="/var/lib/xen/images/xm.vm-53"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="242" operation="stop" operation_key="vm-57_stop_0">
+      <pseudo_event id="243" operation="stop" operation_key="vm-57_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-57" xmfile="/var/lib/xen/images/xm.vm-57"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <pseudo_event id="243" operation="stop" operation_key="vm-61_stop_0">
+      <pseudo_event id="244" operation="stop" operation_key="vm-61_stop_0">
         <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  name="vm-61" xmfile="/var/lib/xen/images/xm.vm-61"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9">
-        <attributes CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="hex-9"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="34">
-    <action_set>
-      <pseudo_event id="244" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="245" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="245" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="35">
+  <synapse id="34">
     <action_set>
-      <pseudo_event id="65" operation="load_stopped_hex-9" operation_key="load_stopped_hex-9">
+      <pseudo_event id="66" operation="load_stopped_hex-9" operation_key="load_stopped_hex-9">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="228" operation="stop" operation_key="vm-03_stop_0"/>
+        <pseudo_event id="229" operation="stop" operation_key="vm-03_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="229" operation="stop" operation_key="vm-06_stop_0"/>
+        <pseudo_event id="230" operation="stop" operation_key="vm-06_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="230" operation="stop" operation_key="vm-09_stop_0"/>
+        <pseudo_event id="231" operation="stop" operation_key="vm-09_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="231" operation="stop" operation_key="vm-13_stop_0"/>
+        <pseudo_event id="232" operation="stop" operation_key="vm-13_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="232" operation="stop" operation_key="vm-17_stop_0"/>
+        <pseudo_event id="233" operation="stop" operation_key="vm-17_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="233" operation="stop" operation_key="vm-21_stop_0"/>
+        <pseudo_event id="234" operation="stop" operation_key="vm-21_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="234" operation="stop" operation_key="vm-25_stop_0"/>
+        <pseudo_event id="235" operation="stop" operation_key="vm-25_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="235" operation="stop" operation_key="vm-29_stop_0"/>
+        <pseudo_event id="236" operation="stop" operation_key="vm-29_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="236" operation="stop" operation_key="vm-33_stop_0"/>
+        <pseudo_event id="237" operation="stop" operation_key="vm-33_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="237" operation="stop" operation_key="vm-37_stop_0"/>
+        <pseudo_event id="238" operation="stop" operation_key="vm-37_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="238" operation="stop" operation_key="vm-41_stop_0"/>
+        <pseudo_event id="239" operation="stop" operation_key="vm-41_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="239" operation="stop" operation_key="vm-45_stop_0"/>
+        <pseudo_event id="240" operation="stop" operation_key="vm-45_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="240" operation="stop" operation_key="vm-49_stop_0"/>
+        <pseudo_event id="241" operation="stop" operation_key="vm-49_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="241" operation="stop" operation_key="vm-53_stop_0"/>
+        <pseudo_event id="242" operation="stop" operation_key="vm-53_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="242" operation="stop" operation_key="vm-57_stop_0"/>
+        <pseudo_event id="243" operation="stop" operation_key="vm-57_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="243" operation="stop" operation_key="vm-61_stop_0"/>
+        <pseudo_event id="244" operation="stop" operation_key="vm-61_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="36">
+  <synapse id="35">
     <action_set>
-      <pseudo_event id="64" operation="load_stopped_hex-8" operation_key="load_stopped_hex-8">
+      <pseudo_event id="65" operation="load_stopped_hex-8" operation_key="load_stopped_hex-8">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="37">
+  <synapse id="36">
     <action_set>
-      <pseudo_event id="63" operation="load_stopped_hex-7" operation_key="load_stopped_hex-7">
+      <pseudo_event id="64" operation="load_stopped_hex-7" operation_key="load_stopped_hex-7">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="38">
+  <synapse id="37">
     <action_set>
-      <pseudo_event id="62" operation="load_stopped_hex-0" operation_key="load_stopped_hex-0">
+      <pseudo_event id="63" operation="load_stopped_hex-0" operation_key="load_stopped_hex-0">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="39">
+  <synapse id="38">
     <action_set>
-      <pseudo_event id="61" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="62" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="158" operation="stop" operation_key="fencing-sbd_stop_0"/>
+        <pseudo_event id="159" operation="stop" operation_key="fencing-sbd_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="160" operation="stop" operation_key="dummy1_stop_0"/>
+        <pseudo_event id="161" operation="stop" operation_key="dummy1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="214" operation="stop" operation_key="dlm:3_stop_0"/>
+        <pseudo_event id="215" operation="stop" operation_key="dlm:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="215" operation="stop" operation_key="o2cb:3_stop_0"/>
+        <pseudo_event id="216" operation="stop" operation_key="o2cb:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="216" operation="stop" operation_key="clvm:3_stop_0"/>
+        <pseudo_event id="217" operation="stop" operation_key="clvm:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="217" operation="stop" operation_key="cmirrord:3_stop_0"/>
+        <pseudo_event id="218" operation="stop" operation_key="cmirrord:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="218" operation="stop" operation_key="vg1:3_stop_0"/>
+        <pseudo_event id="219" operation="stop" operation_key="vg1:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="219" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
+        <pseudo_event id="220" operation="stop" operation_key="ocfs2-1:3_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="228" operation="stop" operation_key="vm-03_stop_0"/>
+        <pseudo_event id="229" operation="stop" operation_key="vm-03_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="229" operation="stop" operation_key="vm-06_stop_0"/>
+        <pseudo_event id="230" operation="stop" operation_key="vm-06_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="230" operation="stop" operation_key="vm-09_stop_0"/>
+        <pseudo_event id="231" operation="stop" operation_key="vm-09_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="231" operation="stop" operation_key="vm-13_stop_0"/>
+        <pseudo_event id="232" operation="stop" operation_key="vm-13_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="232" operation="stop" operation_key="vm-17_stop_0"/>
+        <pseudo_event id="233" operation="stop" operation_key="vm-17_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="233" operation="stop" operation_key="vm-21_stop_0"/>
+        <pseudo_event id="234" operation="stop" operation_key="vm-21_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="234" operation="stop" operation_key="vm-25_stop_0"/>
+        <pseudo_event id="235" operation="stop" operation_key="vm-25_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="235" operation="stop" operation_key="vm-29_stop_0"/>
+        <pseudo_event id="236" operation="stop" operation_key="vm-29_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="236" operation="stop" operation_key="vm-33_stop_0"/>
+        <pseudo_event id="237" operation="stop" operation_key="vm-33_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="237" operation="stop" operation_key="vm-37_stop_0"/>
+        <pseudo_event id="238" operation="stop" operation_key="vm-37_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="238" operation="stop" operation_key="vm-41_stop_0"/>
+        <pseudo_event id="239" operation="stop" operation_key="vm-41_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="239" operation="stop" operation_key="vm-45_stop_0"/>
+        <pseudo_event id="240" operation="stop" operation_key="vm-45_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="240" operation="stop" operation_key="vm-49_stop_0"/>
+        <pseudo_event id="241" operation="stop" operation_key="vm-49_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="241" operation="stop" operation_key="vm-53_stop_0"/>
+        <pseudo_event id="242" operation="stop" operation_key="vm-53_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="242" operation="stop" operation_key="vm-57_stop_0"/>
+        <pseudo_event id="243" operation="stop" operation_key="vm-57_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="243" operation="stop" operation_key="vm-61_stop_0"/>
+        <pseudo_event id="244" operation="stop" operation_key="vm-61_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="244" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="245" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="39">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-hex-9-reboot" on_node="hex-9" on_node_uuid="hex-9">
+        <attributes CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="hex-9"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/bug-lf-2551.scores b/pengine/test10/bug-lf-2551.scores
index 64cbca0..2b0aa12 100644
--- a/pengine/test10/bug-lf-2551.scores
+++ b/pengine/test10/bug-lf-2551.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   hex-9: node is unclean
 Allocation scores:
 clone_color: base-clone allocation score on hex-0: 14
 clone_color: base-clone allocation score on hex-7: 16
diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary
index 4fa553c..1b57ea7 100644
--- a/pengine/test10/bug-lf-2551.summary
+++ b/pengine/test10/bug-lf-2551.summary
@@ -80,9 +80,8 @@ Online: [ hex-0 hex-7 hex-8 ]
  vm-63	(ocf::heartbeat:Xen):	Stopped 
  vm-64	(ocf::heartbeat:Xen):	Stopped 
 
-  notice: Fencing   hex-9: node is unclean
 Transition Summary:
- * Fence (reboot) hex-9
+ * Fence (reboot) hex-9 'peer is no longer part of the cluster'
  * Move    fencing-sbd	(Started hex-9 -> hex-0)
  * Move    dummy1	(Started hex-9 -> hex-0)
  * Stop    dlm:3	(hex-9)
@@ -112,11 +111,10 @@ Executing cluster transition:
  * Pseudo action:   fencing-sbd_stop_0
  * Resource action: dummy1          monitor=300000 on hex-8
  * Resource action: dummy1          monitor=300000 on hex-7
- * Fencing hex-9 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   load_stopped_hex-8
  * Pseudo action:   load_stopped_hex-7
  * Pseudo action:   load_stopped_hex-0
+ * Fencing hex-9 (reboot)
  * Resource action: fencing-sbd     start on hex-0
  * Pseudo action:   dummy1_stop_0
  * Pseudo action:   vm-03_stop_0
@@ -135,6 +133,7 @@ Executing cluster transition:
  * Pseudo action:   vm-53_stop_0
  * Pseudo action:   vm-57_stop_0
  * Pseudo action:   vm-61_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   load_stopped_hex-9
  * Resource action: dummy1          start on hex-0
  * Pseudo action:   base-clone_stop_0
diff --git a/pengine/test10/bug-lf-2606.exp b/pengine/test10/bug-lf-2606.exp
index 55f138b..b14069e 100644
--- a/pengine/test10/bug-lf-2606.exp
+++ b/pengine/test10/bug-lf-2606.exp
@@ -1,108 +1,108 @@
 <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="5" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_10000" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="9" operation="monitor" operation_key="rsc2_monitor_10000" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="21" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="12" operation="stop" operation_key="rsc3:1_stop_0">
+      <pseudo_event id="13" operation="stop" operation_key="rsc3:1_stop_0">
         <attributes CRM_meta_clone="1" 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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="demote" operation_key="rsc3:1_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="15" operation="stop" operation_key="ms3_stop_0"/>
+        <pseudo_event id="12" operation="demote" operation_key="rsc3:1_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <pseudo_event id="16" operation="stop" operation_key="ms3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="11" operation="demote" operation_key="rsc3:1_demote_0">
+      <pseudo_event id="12" operation="demote" operation_key="rsc3:1_demote_0">
         <attributes CRM_meta_clone="1" 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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="19" operation="demote" operation_key="ms3_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <pseudo_event id="20" operation="demote" operation_key="ms3_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6" priority="1000000">
     <action_set>
-      <pseudo_event id="20" operation="demoted" operation_key="ms3_demoted_0">
+      <pseudo_event id="21" operation="demoted" operation_key="ms3_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="demote" operation_key="rsc3:1_demote_0"/>
+        <pseudo_event id="12" operation="demote" operation_key="rsc3:1_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="demote" operation_key="ms3_demote_0"/>
+        <pseudo_event id="20" operation="demote" operation_key="ms3_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="19" operation="demote" operation_key="ms3_demote_0">
+      <pseudo_event id="20" operation="demote" operation_key="ms3_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -110,77 +110,76 @@
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
-      <pseudo_event id="16" operation="stopped" operation_key="ms3_stopped_0">
+      <pseudo_event id="17" operation="stopped" operation_key="ms3_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="stop" operation_key="rsc3:1_stop_0"/>
+        <pseudo_event id="13" operation="stop" operation_key="rsc3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="15" operation="stop" operation_key="ms3_stop_0"/>
+        <pseudo_event id="16" operation="stop" operation_key="ms3_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="15" operation="stop" operation_key="ms3_stop_0">
+      <pseudo_event id="16" operation="stop" operation_key="ms3_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="20" operation="demoted" operation_key="ms3_demoted_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <pseudo_event id="21" operation="demoted" operation_key="ms3_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="node2"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="11">
-    <action_set>
-      <pseudo_event id="21" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="22" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="12">
+  <synapse id="11">
     <action_set>
-      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="5" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stop" operation_key="rsc3:1_stop_0"/>
+        <pseudo_event id="13" operation="stop" operation_key="rsc3:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="21" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="12">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="node2">
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="node2"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/bug-lf-2606.scores b/pengine/test10/bug-lf-2606.scores
index b1e6a02..6a9d522 100644
--- a/pengine/test10/bug-lf-2606.scores
+++ b/pengine/test10/bug-lf-2606.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node2: node is unclean
 Allocation scores:
 clone_color: ms3 allocation score on node1: 0
 clone_color: ms3 allocation score on node2: 0
diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary
index e6cfa89..7e889c9 100644
--- a/pengine/test10/bug-lf-2606.summary
+++ b/pengine/test10/bug-lf-2606.summary
@@ -11,9 +11,8 @@ Online: [ node1 ]
      Masters: [ node2 ]
      Slaves: [ node1 ]
 
-  notice: Fencing   node2: node is unclean
 Transition Summary:
- * Fence (reboot) node2
+ * Fence (reboot) node2 'rsc1 failed there'
  * Stop    rsc1	(node2)
  * Move    rsc2	(Started node2 -> node1)
  * Demote  rsc3:1	(Master -> Stopped node2)
@@ -21,12 +20,12 @@ Transition Summary:
 Executing cluster transition:
  * Pseudo action:   ms3_demote_0
  * Fencing node2 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   rsc3:1_demote_0
  * Pseudo action:   ms3_demoted_0
  * Pseudo action:   ms3_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: rsc2            start on node1
  * Pseudo action:   rsc3:1_stop_0
  * Pseudo action:   ms3_stopped_0
diff --git a/pengine/test10/bug-rh-1097457.scores b/pengine/test10/bug-rh-1097457.scores
index 2fe2859..7729421 100644
--- a/pengine/test10/bug-rh-1097457.scores
+++ b/pengine/test10/bug-rh-1097457.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   lamaVM2: guest is unclean
 Allocation scores:
 clone_color: FAKE6-clone allocation score on lama2: -INFINITY
 clone_color: FAKE6-clone allocation score on lama3: -INFINITY
diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary
index 19aa39d..29dd018 100644
--- a/pengine/test10/bug-rh-1097457.summary
+++ b/pengine/test10/bug-rh-1097457.summary
@@ -31,9 +31,8 @@ Containers: [ lamaVM1:VM1 lamaVM2:VM2 lamaVM3:VM3 ]
  Clone Set: FAKE6-clone [FAKE6]
      Started: [ lamaVM1 lamaVM2 lamaVM3 ]
 
-  notice: Fencing   lamaVM2: guest is unclean
 Transition Summary:
- * Fence (reboot) lamaVM2 (resource: VM2)
+ * Fence (reboot) lamaVM2 (resource: VM2) 'guest is unclean'
  * Recover VM2	(Started lama3)
  * Recover FSlun3	(Started lamaVM2 -> lama2)
  * Restart FAKE4	(Started lamaVM2)
diff --git a/pengine/test10/concurrent-fencing.exp b/pengine/test10/concurrent-fencing.exp
index 354111a..c916c1b 100644
--- a/pengine/test10/concurrent-fencing.exp
+++ b/pengine/test10/concurrent-fencing.exp
@@ -1,39 +1,40 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3">
-        <attributes CRM_meta_on_node="node3" CRM_meta_on_node_uuid="uuid3" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid3"/>
-        </downed>
-      </crm_event>
+      <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete">
+        <attributes />
+      </pseudo_event>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+      </trigger>
+      <trigger>
+        <crm_event id="2" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+      </trigger>
+      <trigger>
+        <crm_event id="3" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid2"/>
-        </downed>
-      </crm_event>
+      <pseudo_event id="4" operation="all_stopped" operation_key="all_stopped">
+        <attributes />
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
+        <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+      <crm_event id="3" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3">
+        <attributes CRM_meta_on_node="node3" CRM_meta_on_node_uuid="uuid3" CRM_meta_stonith_action="reboot" />
         <downed>
-          <node id="uuid1"/>
+          <node id="uuid3"/>
         </downed>
       </crm_event>
     </action_set>
@@ -41,32 +42,31 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="2" operation="stonith_complete" operation_key="stonith_complete">
-        <attributes />
-      </pseudo_event>
+      <crm_event id="2" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid2"/>
+        </downed>
+      </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
-      </trigger>
-      <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
+        <crm_event id="3" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
-      </pseudo_event>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
     </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="2" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/concurrent-fencing.scores b/pengine/test10/concurrent-fencing.scores
index 1be723e..0322231 100644
--- a/pengine/test10/concurrent-fencing.scores
+++ b/pengine/test10/concurrent-fencing.scores
@@ -1,6 +1,3 @@
-  notice: Fencing   node1: node is unclean
-  notice: Fencing   node2: node is unclean
-  notice: Fencing   node3: node is unclean
 Allocation scores:
 native_color: lsb_dummy allocation score on node1: 0
 native_color: lsb_dummy allocation score on node2: 0
diff --git a/pengine/test10/concurrent-fencing.summary b/pengine/test10/concurrent-fencing.summary
index 3f54c2c..46d3323 100644
--- a/pengine/test10/concurrent-fencing.summary
+++ b/pengine/test10/concurrent-fencing.summary
@@ -7,13 +7,10 @@ Node node3 (uuid3): UNCLEAN (offline)
  stonith-1	(stonith:dummy):	Stopped
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped
 
-  notice: Fencing   node1: node is unclean
-  notice: Fencing   node2: node is unclean
-  notice: Fencing   node3: node is unclean
 Transition Summary:
- * Fence (reboot) node3
- * Fence (reboot) node2
- * Fence (reboot) node1
+ * Fence (reboot) node3 'peer is no longer part of the cluster'
+ * Fence (reboot) node2 'peer is no longer part of the cluster'
+ * Fence (reboot) node1 'peer is no longer part of the cluster'
 
 Executing cluster transition:
  * Fencing node3 (reboot)
diff --git a/pengine/test10/guest-node-host-dies.exp b/pengine/test10/guest-node-host-dies.exp
index 73a0264..235813d 100644
--- a/pengine/test10/guest-node-host-dies.exp
+++ b/pengine/test10/guest-node-host-dies.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>
-      <rsc_op id="10" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5">
+      <rsc_op id="11" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5">
         <primitive id="Fencing" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="rhel7-4" CRM_meta_on_node_uuid="5" CRM_meta_timeout="60000"  delay="0" multicast_address="239.255.100.100" pcmk_arg_map="domain:uname" pcmk_host_list="rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5"/>
       </rsc_op>
@@ -10,296 +10,296 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="3" operation="start" operation_key="Fencing_start_0" on_node="rhel7-4" on_node_uuid="5">
+      <rsc_op id="4" operation="start" operation_key="Fencing_start_0" on_node="rhel7-4" on_node_uuid="5">
         <primitive id="Fencing" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="rhel7-4" CRM_meta_on_node_uuid="5" CRM_meta_timeout="60000"  delay="0" multicast_address="239.255.100.100" pcmk_arg_map="domain:uname" pcmk_host_list="rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="10" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="11" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="1" operation="monitor" operation_key="Fencing_monitor_120000" on_node="rhel7-4" on_node_uuid="5">
+      <rsc_op id="2" operation="monitor" operation_key="Fencing_monitor_120000" on_node="rhel7-4" on_node_uuid="5">
         <primitive id="Fencing" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-4" CRM_meta_on_node_uuid="5" CRM_meta_timeout="120000"  delay="0" multicast_address="239.255.100.100" pcmk_arg_map="domain:uname" pcmk_host_list="rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="start" operation_key="Fencing_start_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="4" operation="start" operation_key="Fencing_start_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="rsc_rhel7-1_monitor_5000" on_node="rhel7-5" on_node_uuid="3">
+      <rsc_op id="14" operation="monitor" operation_key="rsc_rhel7-1_monitor_5000" on_node="rhel7-5" on_node_uuid="3">
         <primitive id="rsc_rhel7-1" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-5" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.202"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="start" operation_key="rsc_rhel7-1_start_0" on_node="rhel7-5" on_node_uuid="3"/>
+        <rsc_op id="13" operation="start" operation_key="rsc_rhel7-1_start_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="12" operation="start" operation_key="rsc_rhel7-1_start_0" on_node="rhel7-5" on_node_uuid="3">
+      <rsc_op id="13" operation="start" operation_key="rsc_rhel7-1_start_0" on_node="rhel7-5" on_node_uuid="3">
         <primitive id="rsc_rhel7-1" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="rhel7-5" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.202"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="11" operation="stop" operation_key="rsc_rhel7-1_stop_0"/>
+        <pseudo_event id="12" operation="stop" operation_key="rsc_rhel7-1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="11" operation="stop" operation_key="rsc_rhel7-1_stop_0">
+      <pseudo_event id="12" operation="stop" operation_key="rsc_rhel7-1_stop_0">
         <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.202"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2">
+      <rsc_op id="16" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="rhel7-2" CRM_meta_on_node_uuid="2" CRM_meta_remote_node="lxc1" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml"  force_stop="true" hypervisor="lxc:///"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="container1_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="container1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="14" operation="stop" operation_key="container1_stop_0">
+      <pseudo_event id="15" operation="stop" operation_key="container1_stop_0">
         <attributes CRM_meta_remote_node="lxc1" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml"  force_stop="true" hypervisor="lxc:///"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <pseudo_event id="34" operation="stop" operation_key="lxc1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="17" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4">
+      <rsc_op id="18" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4">
         <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="rhel7-3" CRM_meta_on_node_uuid="4" CRM_meta_remote_node="lxc2" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml"  force_stop="true" hypervisor="lxc:///"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="16" operation="stop" operation_key="container2_stop_0"/>
+        <pseudo_event id="17" operation="stop" operation_key="container2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="16" operation="stop" operation_key="container2_stop_0">
+      <pseudo_event id="17" operation="stop" operation_key="container2_stop_0">
         <attributes CRM_meta_remote_node="lxc2" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml"  force_stop="true" hypervisor="lxc:///"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="lxc2_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <pseudo_event id="37" operation="stop" operation_key="lxc2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="21" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2">
+      <rsc_op id="22" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <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_notify="false" CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="16" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="18" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
+        <pseudo_event id="19" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
+        <rsc_op id="21" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="promote" operation_key="lxc-ms-master_promote_0"/>
+        <pseudo_event id="30" operation="promote" operation_key="lxc-ms-master_promote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="35" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="20" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2">
+      <rsc_op id="21" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <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_notify="false" CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="16" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="20" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="25" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="26" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="35" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="19" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0">
+      <pseudo_event id="20" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms: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_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
+        <pseudo_event id="19" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="27" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="28" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
+        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <pseudo_event id="18" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0">
+      <pseudo_event id="19" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms: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_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+        <pseudo_event id="32" operation="demote" operation_key="lxc-ms-master_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
+        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="lxc-ms_monitor_10000" internal_operation_key="lxc-ms:1_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3">
+      <rsc_op id="25" operation="monitor" operation_key="lxc-ms_monitor_10000" internal_operation_key="lxc-ms:1_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3">
         <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" 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="false" CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3"/>
+        <rsc_op id="24" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3">
+      <rsc_op id="24" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3">
         <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" 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="false" CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="18" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="25" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="26" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0">
+      <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0">
         <attributes CRM_meta_clone="1" 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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="28" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
+        <pseudo_event id="42" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17" priority="1000000">
     <action_set>
-      <pseudo_event id="32" operation="demoted" operation_key="lxc-ms-master_demoted_0">
+      <pseudo_event id="33" operation="demoted" operation_key="lxc-ms-master_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
+        <pseudo_event id="19" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="31" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+        <pseudo_event id="32" operation="demote" operation_key="lxc-ms-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="31" operation="demote" operation_key="lxc-ms-master_demote_0">
+      <pseudo_event id="32" operation="demote" operation_key="lxc-ms-master_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -307,168 +307,168 @@
   </synapse>
   <synapse id="19" priority="1000000">
     <action_set>
-      <pseudo_event id="30" operation="promoted" operation_key="lxc-ms-master_promoted_0">
+      <pseudo_event id="31" operation="promoted" operation_key="lxc-ms-master_promoted_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="21" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
+        <rsc_op id="22" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <pseudo_event id="29" operation="promote" operation_key="lxc-ms-master_promote_0">
+      <pseudo_event id="30" operation="promote" operation_key="lxc-ms-master_promote_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="running" operation_key="lxc-ms-master_running_0"/>
+        <pseudo_event id="27" operation="running" operation_key="lxc-ms-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="28" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+        <pseudo_event id="29" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="33" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21" priority="1000000">
     <action_set>
-      <pseudo_event id="28" operation="stopped" operation_key="lxc-ms-master_stopped_0">
+      <pseudo_event id="29" operation="stopped" operation_key="lxc-ms-master_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="19" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="20" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="27" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="28" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="27" operation="stop" operation_key="lxc-ms-master_stop_0">
+      <pseudo_event id="28" operation="stop" operation_key="lxc-ms-master_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="32" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="33" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
+        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
+        <pseudo_event id="42" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23" priority="1000000">
     <action_set>
-      <pseudo_event id="26" operation="running" operation_key="lxc-ms-master_running_0">
+      <pseudo_event id="27" operation="running" operation_key="lxc-ms-master_running_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
+        <rsc_op id="21" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-2"/>
       </trigger>
       <trigger>
-        <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3"/>
+        <rsc_op id="24" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="rhel7-3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="25" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="26" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <pseudo_event id="25" operation="start" operation_key="lxc-ms-master_start_0">
+      <pseudo_event id="26" operation="start" operation_key="lxc-ms-master_start_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="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+        <pseudo_event id="29" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="33" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <rsc_op id="35" operation="monitor" operation_key="lxc1_monitor_30000" on_node="rhel7-2" on_node_uuid="2">
+      <rsc_op id="36" operation="monitor" operation_key="lxc1_monitor_30000" on_node="rhel7-2" on_node_uuid="2">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="35" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="34" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2">
+      <rsc_op id="35" operation="start" operation_key="lxc1_start_0" on_node="rhel7-2" on_node_uuid="2">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_name="start" CRM_meta_on_node="rhel7-2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
       <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="7" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
+        <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="16" operation="start" operation_key="container1_start_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc1_stop_0"/>
+        <pseudo_event id="34" operation="stop" operation_key="lxc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="33" operation="stop" operation_key="lxc1_stop_0">
+      <pseudo_event id="34" operation="stop" operation_key="lxc1_stop_0">
         <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
       <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
+        <rsc_op id="7" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3">
+      <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="rhel7-5" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -477,7 +477,7 @@
   </synapse>
   <synapse id="29">
     <action_set>
-      <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5">
+      <rsc_op id="7" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="rhel7-4" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -486,7 +486,7 @@
   </synapse>
   <synapse id="30">
     <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4">
+      <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="rhel7-3" CRM_meta_on_node_uuid="4" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -495,69 +495,69 @@
   </synapse>
   <synapse id="31">
     <action_set>
-      <rsc_op id="38" operation="monitor" operation_key="lxc2_monitor_30000" on_node="rhel7-3" on_node_uuid="4">
+      <rsc_op id="39" operation="monitor" operation_key="lxc2_monitor_30000" on_node="rhel7-3" on_node_uuid="4">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="rhel7-3" CRM_meta_on_node_uuid="4" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="37" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4">
+      <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="rhel7-3" on_node_uuid="4">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_name="start" CRM_meta_on_node="rhel7-3" CRM_meta_on_node_uuid="4" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <rsc_op id="5" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="8" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
+        <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
+        <rsc_op id="18" operation="start" operation_key="container2_start_0" on_node="rhel7-3" on_node_uuid="4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="lxc2_stop_0"/>
+        <pseudo_event id="37" operation="stop" operation_key="lxc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <pseudo_event id="36" operation="stop" operation_key="lxc2_stop_0">
+      <pseudo_event id="37" operation="stop" operation_key="lxc2_stop_0">
         <attributes CRM_meta_container="container2" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="5" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
+        <rsc_op id="8" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="34">
     <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3">
+      <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_on_node="rhel7-5" CRM_meta_on_node_uuid="3" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -566,7 +566,7 @@
   </synapse>
   <synapse id="35">
     <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5">
+      <rsc_op id="8" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_on_node="rhel7-4" CRM_meta_on_node_uuid="5" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -575,7 +575,7 @@
   </synapse>
   <synapse id="36">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2">
+      <rsc_op id="5" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_on_node="rhel7-2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
@@ -584,20 +584,7 @@
   </synapse>
   <synapse id="37">
     <action_set>
-      <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1">
-        <attributes CRM_meta_connected="1" CRM_meta_on_node="rhel7-1" CRM_meta_on_node_uuid="1" CRM_meta_shutdown="0" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="1"/>
-          <node id="lxc2"/>
-          <node id="lxc1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="38">
-    <action_set>
-      <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2">
+      <pseudo_event id="42" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2">
         <attributes CRM_meta_master_lxc_ms="5" CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="lxc2"/>
@@ -606,13 +593,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="16" operation="stop" operation_key="container2_stop_0"/>
+        <pseudo_event id="17" operation="stop" operation_key="container2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="39">
+  <synapse id="38">
     <action_set>
-      <pseudo_event id="40" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1">
+      <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1">
         <attributes CRM_meta_last_failure_lxc_ms="1458766329" CRM_meta_master_lxc_ms="10" CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_stonith_action="reboot" />
         <downed>
           <node id="lxc1"/>
@@ -621,62 +608,75 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="container1_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="container1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="40">
+  <synapse id="39">
     <action_set>
-      <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="40" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
+        <pseudo_event id="41" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
       </trigger>
       <trigger>
-        <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/>
+        <pseudo_event id="42" operation="stonith" operation_key="stonith-lxc2-reboot" on_node="lxc2" on_node_uuid="lxc2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="41">
+  <synapse id="40">
     <action_set>
-      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="10" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5"/>
+        <rsc_op id="11" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <pseudo_event id="11" operation="stop" operation_key="rsc_rhel7-1_stop_0"/>
+        <pseudo_event id="12" operation="stop" operation_key="rsc_rhel7-1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="container1_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="container1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stop" operation_key="container2_stop_0"/>
+        <pseudo_event id="17" operation="stop" operation_key="container2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="20" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc1_stop_0"/>
+        <pseudo_event id="34" operation="stop" operation_key="lxc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="lxc2_stop_0"/>
+        <pseudo_event id="37" operation="stop" operation_key="lxc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="40" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="41">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1">
+        <attributes CRM_meta_connected="1" CRM_meta_on_node="rhel7-1" CRM_meta_on_node_uuid="1" CRM_meta_shutdown="0" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="1"/>
+          <node id="lxc2"/>
+          <node id="lxc1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/pengine/test10/guest-node-host-dies.scores b/pengine/test10/guest-node-host-dies.scores
index 663d236..0d7ad3f 100644
--- a/pengine/test10/guest-node-host-dies.scores
+++ b/pengine/test10/guest-node-host-dies.scores
@@ -1,6 +1,3 @@
-  notice: Fencing   lxc1: guest is unclean
-  notice: Fencing   lxc2: guest is unclean
-  notice: Fencing   rhel7-1: node is unclean
 Allocation scores:
 clone_color: lxc-ms-master allocation score on lxc1: INFINITY
 clone_color: lxc-ms-master allocation score on lxc2: INFINITY
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index 679deb6..d22fe3d 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -10,13 +10,10 @@ Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
  Master/Slave Set: lxc-ms-master [lxc-ms]
      Stopped: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
 
-  notice: Fencing   lxc1: guest is unclean
-  notice: Fencing   lxc2: guest is unclean
-  notice: Fencing   rhel7-1: node is unclean
 Transition Summary:
- * Fence (reboot) rhel7-1
- * Fence (reboot) lxc2 (resource: container2)
- * Fence (reboot) lxc1 (resource: container1)
+ * Fence (reboot) lxc2 (resource: container2) 'guest is unclean'
+ * Fence (reboot) lxc1 (resource: container1) 'guest is unclean'
+ * Fence (reboot) rhel7-1 'rsc_rhel7-1 is thought to be active there'
  * Restart Fencing	(Started rhel7-4)
  * Move    rsc_rhel7-1	(Started rhel7-1 -> rhel7-5)
  * Recover container1	(Started rhel7-1 -> rhel7-2)
diff --git a/pengine/test10/interleave-pseudo-stop.exp b/pengine/test10/interleave-pseudo-stop.exp
index 7a6b7ed..63217e8 100644
--- a/pengine/test10/interleave-pseudo-stop.exp
+++ b/pengine/test10/interleave-pseudo-stop.exp
@@ -1,43 +1,43 @@
  <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="7" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0">
+      <pseudo_event id="8" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="node1,node2"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="stonithcloneset_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="11" operation="stop" operation_key="stonithcloneset_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="1" priority="1000000">
      <action_set>
-      <pseudo_event id="11" operation="stopped" operation_key="stonithcloneset_stopped_0">
+      <pseudo_event id="12" operation="stopped" operation_key="stonithcloneset_stopped_0">
         <attributes CRM_meta_clone_max="2" 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="7" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0"/>
+        <pseudo_event id="8" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="stonithcloneset_stop_0"/>
+        <pseudo_event id="11" operation="stop" operation_key="stonithcloneset_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="2">
      <action_set>
-      <pseudo_event id="10" operation="stop" operation_key="stonithcloneset_stop_0">
+      <pseudo_event id="11" operation="stop" operation_key="stonithcloneset_stop_0">
         <attributes CRM_meta_clone_max="2" 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>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
@@ -50,7 +50,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="23" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
+        <pseudo_event id="24" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
@@ -63,7 +63,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="25" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
+        <pseudo_event id="26" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="59" operation="notify" operation_key="evmsclone:0_post_notify_stop_0" internal_operation_key="evmsclone:1_post_notify_stonith_0"/>
@@ -93,40 +93,40 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="7">
      <action_set>
-      <pseudo_event id="14" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0">
+      <pseudo_event id="15" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_active_resource="evmsclone:0 evmsclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="evmsclone:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="evmsclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_timeout="20000" />
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="21" operation="stop" operation_key="evmscloneset_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
+        <pseudo_event id="22" operation="stop" operation_key="evmscloneset_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
+        <pseudo_event id="30" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="45" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
        </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
-      <pseudo_event id="26" operation="notified" operation_key="evmscloneset_confirmed-post_notify_stopped_0">
+      <pseudo_event id="27" operation="notified" operation_key="evmscloneset_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
        <trigger>
-        <pseudo_event id="25" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
+        <pseudo_event id="26" operation="notify" operation_key="evmscloneset_post_notify_stopped_0"/>
        </trigger>
       <trigger>
         <rsc_op id="61" operation="notify" operation_key="evmsclone:1_post_notify_stop_0" internal_operation_key="evmsclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -135,28 +135,28 @@
    </synapse>
   <synapse id="9" priority="1000000">
      <action_set>
-      <pseudo_event id="25" operation="notify" operation_key="evmscloneset_post_notify_stopped_0">
+      <pseudo_event id="26" operation="notify" operation_key="evmscloneset_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="22" operation="stopped" operation_key="evmscloneset_stopped_0"/>
+        <pseudo_event id="23" operation="stopped" operation_key="evmscloneset_stopped_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="24" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="25" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="10">
      <action_set>
-      <pseudo_event id="24" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0">
+      <pseudo_event id="25" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="23" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
+        <pseudo_event id="24" operation="notify" operation_key="evmscloneset_pre_notify_stop_0"/>
        </trigger>
        <trigger>
         <rsc_op id="78" operation="notify" operation_key="evmsclone:1_pre_notify_stop_0" internal_operation_key="evmsclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -165,7 +165,7 @@
    </synapse>
   <synapse id="11">
     <action_set>
-      <pseudo_event id="23" operation="notify" operation_key="evmscloneset_pre_notify_stop_0">
+      <pseudo_event id="24" operation="notify" operation_key="evmscloneset_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -173,37 +173,37 @@
   </synapse>
   <synapse id="12" priority="1000000">
      <action_set>
-      <pseudo_event id="22" operation="stopped" operation_key="evmscloneset_stopped_0">
+      <pseudo_event id="23" operation="stopped" operation_key="evmscloneset_stopped_0">
         <attributes CRM_meta_clone_max="2" 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="14" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0"/>
        </trigger>
       <trigger>
-        <pseudo_event id="21" operation="stop" operation_key="evmscloneset_stop_0"/>
+        <pseudo_event id="22" operation="stop" operation_key="evmscloneset_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="13">
      <action_set>
-      <pseudo_event id="21" operation="stop" operation_key="evmscloneset_stop_0">
+      <pseudo_event id="22" operation="stop" operation_key="evmscloneset_stop_0">
         <attributes CRM_meta_clone_max="2" 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="24" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
        <trigger>
-        <pseudo_event id="41" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="25" operation="notified" operation_key="evmscloneset_confirmed-pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="56" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="42" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="57" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
@@ -216,7 +216,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="38" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
+        <pseudo_event id="39" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
@@ -229,7 +229,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="40" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
+        <pseudo_event id="41" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="62" operation="notify" operation_key="imagestoreclone:0_post_notify_stop_0" internal_operation_key="imagestoreclone:1_post_notify_stonith_0"/>
@@ -259,34 +259,34 @@
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="29" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0">
+      <pseudo_event id="30" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="imagestoreclone:0 imagestoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="imagestoreclone:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="imagestoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_timeout="60000"  device="/dev/evms/vmsharedclustercontainer/imagestore" directory="/var/lib/xen/images" fstype="ocfs2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="imagestorecloneset_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="37" operation="stop" operation_key="imagestorecloneset_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="19" priority="1000000">
      <action_set>
-      <pseudo_event id="41" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0">
+      <pseudo_event id="42" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="40" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
+        <pseudo_event id="41" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0"/>
        </trigger>
       <trigger>
         <rsc_op id="64" operation="notify" operation_key="imagestoreclone:1_post_notify_stop_0" internal_operation_key="imagestoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -295,28 +295,28 @@
    </synapse>
   <synapse id="20" priority="1000000">
      <action_set>
-      <pseudo_event id="40" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0">
+      <pseudo_event id="41" operation="notify" operation_key="imagestorecloneset_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="37" operation="stopped" operation_key="imagestorecloneset_stopped_0"/>
+        <pseudo_event id="38" operation="stopped" operation_key="imagestorecloneset_stopped_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="39" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="40" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="21">
      <action_set>
-      <pseudo_event id="39" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0">
+      <pseudo_event id="40" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="38" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
+        <pseudo_event id="39" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0"/>
        </trigger>
        <trigger>
         <rsc_op id="81" operation="notify" operation_key="imagestoreclone:1_pre_notify_stop_0" internal_operation_key="imagestoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -325,7 +325,7 @@
    </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="38" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0">
+      <pseudo_event id="39" operation="notify" operation_key="imagestorecloneset_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -333,31 +333,31 @@
   </synapse>
   <synapse id="23" priority="1000000">
      <action_set>
-      <pseudo_event id="37" operation="stopped" operation_key="imagestorecloneset_stopped_0">
+      <pseudo_event id="38" operation="stopped" operation_key="imagestorecloneset_stopped_0">
         <attributes CRM_meta_clone_max="2" 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="29" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
+        <pseudo_event id="30" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
        </trigger>
       <trigger>
-        <pseudo_event id="36" operation="stop" operation_key="imagestorecloneset_stop_0"/>
+        <pseudo_event id="37" operation="stop" operation_key="imagestorecloneset_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="24">
      <action_set>
-      <pseudo_event id="36" operation="stop" operation_key="imagestorecloneset_stop_0">
+      <pseudo_event id="37" operation="stop" operation_key="imagestorecloneset_stop_0">
         <attributes CRM_meta_clone_max="2" 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="39" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
        <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="40" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
@@ -370,7 +370,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="53" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
+        <pseudo_event id="54" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
@@ -383,7 +383,7 @@
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="55" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
+        <pseudo_event id="56" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="65" operation="notify" operation_key="configstoreclone:0_post_notify_stop_0" internal_operation_key="configstoreclone:1_post_notify_stonith_0"/>
@@ -413,34 +413,34 @@
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
      <action_set>
-      <pseudo_event id="44" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0">
+      <pseudo_event id="45" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="configstoreclone:0 configstoreclone:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="configstoreclone:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " 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="configstoreclone:1" CRM_meta_notify_stop_uname="node1" CRM_meta_timeout="60000"  device="/dev/evms/vmsharedclustercontainer/configstore" directory="/etc/xen/vm" fstype="ocfs2"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="51" operation="stop" operation_key="configstorecloneset_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="52" operation="stop" operation_key="configstorecloneset_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30" priority="1000000">
     <action_set>
-      <pseudo_event id="56" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0">
+      <pseudo_event id="57" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="55" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
+        <pseudo_event id="56" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0"/>
       </trigger>
       <trigger>
         <rsc_op id="67" operation="notify" operation_key="configstoreclone:1_post_notify_stop_0" internal_operation_key="configstoreclone:0_post_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -449,28 +449,28 @@
    </synapse>
   <synapse id="31" priority="1000000">
      <action_set>
-      <pseudo_event id="55" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0">
+      <pseudo_event id="56" operation="notify" operation_key="configstorecloneset_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="52" operation="stopped" operation_key="configstorecloneset_stopped_0"/>
+        <pseudo_event id="53" operation="stopped" operation_key="configstorecloneset_stopped_0"/>
        </trigger>
       <trigger>
-        <pseudo_event id="54" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="55" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="32">
      <action_set>
-      <pseudo_event id="54" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0">
+      <pseudo_event id="55" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="53" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
+        <pseudo_event id="54" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0"/>
        </trigger>
        <trigger>
         <rsc_op id="84" operation="notify" operation_key="configstoreclone:1_pre_notify_stop_0" internal_operation_key="configstoreclone:0_pre_notify_stop_0" on_node="node2" on_node_uuid="2529f279-adaf-4ff5-9198-4646e845c5a5"/>
@@ -479,7 +479,7 @@
    </synapse>
   <synapse id="33">
      <action_set>
-      <pseudo_event id="53" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0">
+      <pseudo_event id="54" operation="notify" operation_key="configstorecloneset_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
@@ -487,87 +487,76 @@
    </synapse>
   <synapse id="34" priority="1000000">
      <action_set>
-      <pseudo_event id="52" operation="stopped" operation_key="configstorecloneset_stopped_0">
+      <pseudo_event id="53" operation="stopped" operation_key="configstorecloneset_stopped_0">
         <attributes CRM_meta_clone_max="2" 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="44" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="51" operation="stop" operation_key="configstorecloneset_stop_0"/>
+        <pseudo_event id="52" operation="stop" operation_key="configstorecloneset_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="35">
      <action_set>
-      <pseudo_event id="51" operation="stop" operation_key="configstorecloneset_stop_0">
+      <pseudo_event id="52" operation="stop" operation_key="configstorecloneset_stop_0">
         <attributes CRM_meta_clone_max="2" 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="54" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
       <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <pseudo_event id="55" operation="notified" operation_key="configstorecloneset_confirmed-pre_notify_stop_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="36">
      <action_set>
-      <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="37">
-    <action_set>
-      <pseudo_event id="57" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="58" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="58" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
        </trigger>
      </inputs>
    </synapse>
-  <synapse id="38">
+  <synapse id="37">
     <action_set>
-      <pseudo_event id="4" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="5" operation="all_stopped" operation_key="all_stopped">
         <attributes />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="7" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0"/>
+        <pseudo_event id="8" operation="stop" operation_key="stonithclone:0_stop_0" internal_operation_key="stonithclone:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="evmsclone:0_stop_0" internal_operation_key="evmsclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="26" operation="notified" operation_key="evmscloneset_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="27" operation="notified" operation_key="evmscloneset_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
+        <pseudo_event id="30" operation="stop" operation_key="imagestoreclone:0_stop_0" internal_operation_key="imagestoreclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="41" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="42" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
+        <pseudo_event id="45" operation="stop" operation_key="configstoreclone:0_stop_0" internal_operation_key="configstoreclone:1_stop_0"/>
        </trigger>
        <trigger>
-        <pseudo_event id="56" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="57" operation="notified" operation_key="configstorecloneset_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="57" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="58" operation="stonith_complete" operation_key="stonith_complete"/>
        </trigger>
       <trigger>
         <pseudo_event id="60" operation="notified" operation_key="evmsclone:0_notified_0" internal_operation_key="evmsclone:1_confirmed-post_notify_stonith_0"/>
@@ -580,5 +569,15 @@
       </trigger>
      </inputs>
    </synapse>
+  <synapse id="38">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="f6d93040-a9ad-4745-a647-57ed32444ca8" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="f6d93040-a9ad-4745-a647-57ed32444ca8"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
  </transition_graph>
-
diff --git a/pengine/test10/interleave-pseudo-stop.scores b/pengine/test10/interleave-pseudo-stop.scores
index 625ba18..014f4de 100644
--- a/pengine/test10/interleave-pseudo-stop.scores
+++ b/pengine/test10/interleave-pseudo-stop.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 clone_color: configstoreclone:0 allocation score on node1: 0
 clone_color: configstoreclone:0 allocation score on node2: 1
diff --git a/pengine/test10/interleave-pseudo-stop.summary b/pengine/test10/interleave-pseudo-stop.summary
index 8c22b2f..01ce0ec 100644
--- a/pengine/test10/interleave-pseudo-stop.summary
+++ b/pengine/test10/interleave-pseudo-stop.summary
@@ -16,9 +16,8 @@ Online: [ node2 ]
      configstoreclone	(ocf::heartbeat:Filesystem):	Started node1 (UNCLEAN)
      Started: [ node2 ]
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'peer is no longer part of the cluster'
  * Stop    stonithclone:1	(node1)
  * Stop    evmsclone:1	(node1)
  * Stop    imagestoreclone:1	(node1)
@@ -29,7 +28,6 @@ Executing cluster transition:
  * Pseudo action:   imagestorecloneset_pre_notify_stop_0
  * Pseudo action:   configstorecloneset_pre_notify_stop_0
  * Fencing node1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   stonithcloneset_stop_0
  * Resource action: evmsclone:1     notify on node2
  * Pseudo action:   evmsclone:0_post_notify_stop_0
@@ -42,6 +40,7 @@ Executing cluster transition:
  * Pseudo action:   configstoreclone:0_post_notify_stop_0
  * Pseudo action:   configstorecloneset_confirmed-pre_notify_stop_0
  * Pseudo action:   configstorecloneset_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   stonithclone:0_stop_0
  * Pseudo action:   stonithcloneset_stopped_0
  * Pseudo action:   imagestoreclone:0_stop_0
diff --git a/pengine/test10/master-7.exp b/pengine/test10/master-7.exp
index be05853..971949d 100644
--- a/pengine/test10/master-7.exp
+++ b/pengine/test10/master-7.exp
@@ -1,69 +1,69 @@
 <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="33" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="34" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.180"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="33" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="32" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="33" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="40000"  ip="192.168.100.180"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0">
         <attributes CRM_meta_timeout="20000"  ip="192.168.100.180"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0">
+      <pseudo_event id="47" operation="stopped" operation_key="group-1_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0">
+      <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -71,88 +71,88 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="44" operation="running" operation_key="group-1_running_0">
+      <pseudo_event id="45" operation="running" operation_key="group-1_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="43" operation="start" operation_key="group-1_start_0">
+      <pseudo_event id="44" operation="start" operation_key="group-1_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0"/>
+        <pseudo_event id="47" operation="stopped" operation_key="group-1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="36" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="37" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="39" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="40" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -161,13 +161,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -176,22 +176,22 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -200,93 +200,93 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="42" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="43" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="49" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="50" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="48" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="49" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="48" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="49" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -295,63 +295,63 @@
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="52" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="53" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.184"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="51" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="52" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <rsc_op id="51" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="52" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="40000"  ip="192.168.100.184"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0">
+      <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0">
         <attributes CRM_meta_timeout="20000"  ip="192.168.100.184"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0">
+      <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -360,7 +360,7 @@
   </synapse>
   <synapse id="24">
     <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -369,7 +369,7 @@
   </synapse>
   <synapse id="25">
     <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -378,7 +378,7 @@
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -387,91 +387,91 @@
   </synapse>
   <synapse id="27" priority="1000000">
     <action_set>
-      <pseudo_event id="69" operation="stopped" operation_key="DoFencing_stopped_0">
+      <pseudo_event id="70" operation="stopped" operation_key="DoFencing_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0">
+      <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0">
+      <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="88" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0">
+      <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="92" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="78" operation="stop" operation_key="ocf_msdummy:4_stop_0">
+      <pseudo_event id="79" operation="stop" operation_key="ocf_msdummy:4_stop_0">
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="88" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -480,7 +480,7 @@
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -489,7 +489,7 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -498,7 +498,7 @@
   </synapse>
   <synapse id="35">
     <action_set>
-      <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -507,7 +507,7 @@
   </synapse>
   <synapse id="36">
     <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -516,7 +516,7 @@
   </synapse>
   <synapse id="37">
     <action_set>
-      <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -525,7 +525,7 @@
   </synapse>
   <synapse id="38">
     <action_set>
-      <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -534,7 +534,7 @@
   </synapse>
   <synapse id="39">
     <action_set>
-      <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -543,7 +543,7 @@
   </synapse>
   <synapse id="40">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="22" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -552,22 +552,22 @@
   </synapse>
   <synapse id="41" priority="1000000">
     <action_set>
-      <pseudo_event id="92" operation="demoted" operation_key="master_rsc_1_demoted_0">
+      <pseudo_event id="93" operation="demoted" operation_key="master_rsc_1_demoted_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
+        <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0"/>
+        <pseudo_event id="92" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="42">
     <action_set>
-      <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0">
+      <pseudo_event id="92" operation="demote" operation_key="master_rsc_1_demote_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -575,98 +575,97 @@
   </synapse>
   <synapse id="43" priority="1000000">
     <action_set>
-      <pseudo_event id="88" operation="stopped" operation_key="master_rsc_1_stopped_0">
+      <pseudo_event id="89" operation="stopped" operation_key="master_rsc_1_stopped_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
+        <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="78" operation="stop" operation_key="ocf_msdummy:4_stop_0"/>
+        <pseudo_event id="79" operation="stop" operation_key="ocf_msdummy:4_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <pseudo_event id="88" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="44">
     <action_set>
-      <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0">
+      <pseudo_event id="88" operation="stop" operation_key="master_rsc_1_stop_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="92" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="93" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="45">
     <action_set>
-      <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
-        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="46">
-    <action_set>
-      <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="94" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="47">
+  <synapse id="46">
     <action_set>
-      <pseudo_event id="17" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="18" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
+        <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="78" operation="stop" operation_key="ocf_msdummy:4_stop_0"/>
+        <pseudo_event id="79" operation="stop" operation_key="ocf_msdummy:4_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="94" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="47">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/master-7.scores b/pengine/test10/master-7.scores
index 7569625..37fc6cd 100644
--- a/pengine/test10/master-7.scores
+++ b/pengine/test10/master-7.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c001n01: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/master-7.summary b/pengine/test10/master-7.summary
index d76051e..4c58184 100644
--- a/pengine/test10/master-7.summary
+++ b/pengine/test10/master-7.summary
@@ -28,9 +28,8 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:6	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n02 
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
-  notice: Fencing   c001n01: node is unclean
 Transition Summary:
- * Fence (reboot) c001n01
+ * Fence (reboot) c001n01 'peer is no longer part of the cluster'
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
  * Move    ocf_192.168.100.181	(Started c001n03 -> c001n02)
  * Move    heartbeat_192.168.100.182	(Started c001n03 -> c001n02)
@@ -60,18 +59,17 @@ Executing cluster transition:
  * Resource action: ocf_msdummy:7   monitor on c001n02
  * Pseudo action:   master_rsc_1_demote_0
  * Fencing c001n01 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   DcIPaddr_stop_0
  * Resource action: heartbeat_192.168.100.182 stop on c001n03
- * Resource action: lsb_dummy       start on c001n08
  * Pseudo action:   rsc_c001n01_stop_0
  * Pseudo action:   DoFencing_stop_0
  * Pseudo action:   ocf_msdummy:0_demote_0
  * Pseudo action:   master_rsc_1_demoted_0
  * Pseudo action:   master_rsc_1_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: DcIPaddr        start on c001n03
  * Resource action: ocf_192.168.100.181 stop on c001n03
- * Resource action: lsb_dummy       monitor=5000 on c001n08
+ * Resource action: lsb_dummy       start on c001n08
  * Resource action: rsc_c001n01     start on c001n03
  * Pseudo action:   child_DoFencing:0_stop_0
  * Pseudo action:   DoFencing_stopped_0
@@ -85,6 +83,7 @@ Executing cluster transition:
  * Resource action: ocf_192.168.100.181 start on c001n02
  * Resource action: heartbeat_192.168.100.182 start on c001n02
  * Resource action: ocf_192.168.100.183 start on c001n02
+ * Resource action: lsb_dummy       monitor=5000 on c001n08
  * Resource action: rsc_c001n01     monitor=5000 on c001n03
  * Pseudo action:   group-1_running_0
  * Resource action: ocf_192.168.100.181 monitor=5000 on c001n02
diff --git a/pengine/test10/master-8.exp b/pengine/test10/master-8.exp
index 6843922..e680354 100644
--- a/pengine/test10/master-8.exp
+++ b/pengine/test10/master-8.exp
@@ -1,69 +1,69 @@
 <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="33" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="34" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.180"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="33" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="32" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="33" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="40000"  ip="192.168.100.180"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0">
         <attributes CRM_meta_timeout="20000"  ip="192.168.100.180"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0">
+      <pseudo_event id="47" operation="stopped" operation_key="group-1_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0">
+      <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -71,88 +71,88 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="44" operation="running" operation_key="group-1_running_0">
+      <pseudo_event id="45" operation="running" operation_key="group-1_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="43" operation="start" operation_key="group-1_start_0">
+      <pseudo_event id="44" operation="start" operation_key="group-1_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0"/>
+        <pseudo_event id="47" operation="stopped" operation_key="group-1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="36" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="37" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="39" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="40" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -161,13 +161,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -176,22 +176,22 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000" >
           <param name="1" value="192.168.100.182"/>
@@ -200,93 +200,93 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="42" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="43" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="42" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="44" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="46" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="49" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="50" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="48" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="49" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="48" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="49" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -295,63 +295,63 @@
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="52" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="53" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="192.168.100.184"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="51" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="52" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <rsc_op id="51" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="52" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="40000"  ip="192.168.100.184"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0">
+      <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0">
         <attributes CRM_meta_timeout="20000"  ip="192.168.100.184"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0">
+      <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -360,7 +360,7 @@
   </synapse>
   <synapse id="24">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -369,7 +369,7 @@
   </synapse>
   <synapse id="25">
     <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -378,7 +378,7 @@
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  hostlist="c001n01 c001n08 c001n02 c001n03 "/>
       </rsc_op>
@@ -387,102 +387,102 @@
   </synapse>
   <synapse id="27" priority="1000000">
     <action_set>
-      <pseudo_event id="69" operation="stopped" operation_key="DoFencing_stopped_0">
+      <pseudo_event id="70" operation="stopped" operation_key="DoFencing_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0"/>
+        <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <pseudo_event id="68" operation="stop" operation_key="DoFencing_stop_0">
+      <pseudo_event id="69" operation="stop" operation_key="DoFencing_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <rsc_op id="73" operation="monitor" operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="74" operation="monitor" operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
+        <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="72" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="73" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <rsc_op id="72" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="73" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
+        <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="84" operation="start" operation_key="master_rsc_1_start_0"/>
+        <pseudo_event id="85" operation="start" operation_key="master_rsc_1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0">
+      <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="86" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0">
+      <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="90" operation="demote" operation_key="master_rsc_1_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -491,7 +491,7 @@
   </synapse>
   <synapse id="34">
     <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -500,7 +500,7 @@
   </synapse>
   <synapse id="35">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -509,7 +509,7 @@
   </synapse>
   <synapse id="36">
     <action_set>
-      <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -518,7 +518,7 @@
   </synapse>
   <synapse id="37">
     <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -527,7 +527,7 @@
   </synapse>
   <synapse id="38">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -536,7 +536,7 @@
   </synapse>
   <synapse id="39">
     <action_set>
-      <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -545,7 +545,7 @@
   </synapse>
   <synapse id="40">
     <action_set>
-      <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -554,7 +554,7 @@
   </synapse>
   <synapse id="41">
     <action_set>
-      <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -563,7 +563,7 @@
   </synapse>
   <synapse id="42">
     <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
         <attributes CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="10000"  logfile="/var/log/cts_ocfdummy.log"/>
       </rsc_op>
@@ -572,22 +572,22 @@
   </synapse>
   <synapse id="43" priority="1000000">
     <action_set>
-      <pseudo_event id="91" operation="demoted" operation_key="master_rsc_1_demoted_0">
+      <pseudo_event id="92" operation="demoted" operation_key="master_rsc_1_demoted_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
+        <pseudo_event id="71" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="90" operation="demote" operation_key="master_rsc_1_demote_0"/>
+        <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="44">
     <action_set>
-      <pseudo_event id="90" operation="demote" operation_key="master_rsc_1_demote_0">
+      <pseudo_event id="91" operation="demote" operation_key="master_rsc_1_demote_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -595,152 +595,151 @@
   </synapse>
   <synapse id="45" priority="1000000">
     <action_set>
-      <pseudo_event id="87" operation="stopped" operation_key="master_rsc_1_stopped_0">
+      <pseudo_event id="88" operation="stopped" operation_key="master_rsc_1_stopped_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
+        <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="86" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="46">
     <action_set>
-      <pseudo_event id="86" operation="stop" operation_key="master_rsc_1_stop_0">
+      <pseudo_event id="87" operation="stop" operation_key="master_rsc_1_stop_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="91" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <pseudo_event id="92" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="47" priority="1000000">
     <action_set>
-      <pseudo_event id="85" operation="running" operation_key="master_rsc_1_running_0">
+      <pseudo_event id="86" operation="running" operation_key="master_rsc_1_running_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="72" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="73" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <pseudo_event id="84" operation="start" operation_key="master_rsc_1_start_0"/>
+        <pseudo_event id="85" operation="start" operation_key="master_rsc_1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="48">
     <action_set>
-      <pseudo_event id="84" operation="start" operation_key="master_rsc_1_start_0">
+      <pseudo_event id="85" operation="start" operation_key="master_rsc_1_start_0">
         <attributes CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="4" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
       <trigger>
-        <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
       <trigger>
-        <pseudo_event id="87" operation="stopped" operation_key="master_rsc_1_stopped_0"/>
+        <pseudo_event id="88" operation="stopped" operation_key="master_rsc_1_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="91" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
+        <pseudo_event id="92" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="49">
     <action_set>
-      <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
-        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="50">
-    <action_set>
-      <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="51">
+  <synapse id="50">
     <action_set>
-      <pseudo_event id="16" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="17" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="DcIPaddr_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="41" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
       </trigger>
       <trigger>
-        <rsc_op id="47" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="48" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_c001n01_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_c001n01_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
+        <pseudo_event id="60" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
+        <pseudo_event id="72" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="51">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/master-8.scores b/pengine/test10/master-8.scores
index 880d7fb..c9d1cc9 100644
--- a/pengine/test10/master-8.scores
+++ b/pengine/test10/master-8.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c001n01: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/master-8.summary b/pengine/test10/master-8.summary
index 7d0b840..e8d90d2 100644
--- a/pengine/test10/master-8.summary
+++ b/pengine/test10/master-8.summary
@@ -28,9 +28,8 @@ Online: [ c001n02 c001n03 c001n08 ]
      ocf_msdummy:6	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n02 
      ocf_msdummy:7	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n08 
 
-  notice: Fencing   c001n01: node is unclean
 Transition Summary:
- * Fence (reboot) c001n01
+ * Fence (reboot) c001n01 'peer is no longer part of the cluster'
  * Move    DcIPaddr	(Started c001n01 -> c001n03)
  * Move    ocf_192.168.100.181	(Started c001n03 -> c001n02)
  * Move    heartbeat_192.168.100.182	(Started c001n03 -> c001n02)
@@ -61,18 +60,17 @@ Executing cluster transition:
  * Resource action: ocf_msdummy:7   monitor on c001n02
  * Pseudo action:   master_rsc_1_demote_0
  * Fencing c001n01 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   DcIPaddr_stop_0
  * Resource action: heartbeat_192.168.100.182 stop on c001n03
- * Resource action: lsb_dummy       start on c001n08
  * Pseudo action:   rsc_c001n01_stop_0
  * Pseudo action:   DoFencing_stop_0
  * Pseudo action:   ocf_msdummy:0_demote_0
  * Pseudo action:   master_rsc_1_demoted_0
  * Pseudo action:   master_rsc_1_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: DcIPaddr        start on c001n03
  * Resource action: ocf_192.168.100.181 stop on c001n03
- * Resource action: lsb_dummy       monitor=5000 on c001n08
+ * Resource action: lsb_dummy       start on c001n08
  * Resource action: rsc_c001n01     start on c001n03
  * Pseudo action:   child_DoFencing:0_stop_0
  * Pseudo action:   DoFencing_stopped_0
@@ -86,6 +84,7 @@ Executing cluster transition:
  * Resource action: ocf_192.168.100.181 start on c001n02
  * Resource action: heartbeat_192.168.100.182 start on c001n02
  * Resource action: ocf_192.168.100.183 start on c001n02
+ * Resource action: lsb_dummy       monitor=5000 on c001n08
  * Resource action: rsc_c001n01     monitor=5000 on c001n03
  * Resource action: ocf_msdummy:0   start on c001n03
  * Pseudo action:   master_rsc_1_running_0
diff --git a/pengine/test10/migrate-fencing.exp b/pengine/test10/migrate-fencing.exp
index a670395..5ef64d7 100644
--- a/pengine/test10/migrate-fencing.exp
+++ b/pengine/test10/migrate-fencing.exp
@@ -1,533 +1,533 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <pseudo_event id="20" operation="stop" operation_key="FencingChild:0_stop_0">
+      <pseudo_event id="21" operation="stop" operation_key="FencingChild:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_timeout="180000"  pcmk_arg_map="domain:uname"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="Fencing_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="30" operation="stop" operation_key="Fencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1" priority="1000000">
     <action_set>
-      <pseudo_event id="30" operation="stopped" operation_key="Fencing_stopped_0">
+      <pseudo_event id="31" operation="stopped" operation_key="Fencing_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="20" operation="stop" operation_key="FencingChild:0_stop_0"/>
+        <pseudo_event id="21" operation="stop" operation_key="FencingChild:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="stop" operation_key="Fencing_stop_0"/>
+        <pseudo_event id="30" operation="stop" operation_key="Fencing_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="29" operation="stop" operation_key="Fencing_stop_0">
+      <pseudo_event id="30" operation="stop" operation_key="Fencing_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="43" operation="stopped" operation_key="group-1_stopped_0">
+      <pseudo_event id="44" operation="stopped" operation_key="group-1_stopped_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="r192.168.101.181_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="r192.168.101.181_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="r192.168.101.182_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="r192.168.101.182_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="r192.168.101.183_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="r192.168.101.183_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="43" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="42" operation="stop" operation_key="group-1_stop_0">
+      <pseudo_event id="43" operation="stop" operation_key="group-1_stop_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="53" operation="stop" operation_key="lsb-dummy_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="54" operation="stop" operation_key="lsb-dummy_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="41" operation="running" operation_key="group-1_running_0">
+      <pseudo_event id="42" operation="running" operation_key="group-1_running_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="33" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="36" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="39" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="40" operation="start" operation_key="group-1_start_0">
+      <pseudo_event id="41" operation="start" operation_key="group-1_start_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="43" operation="stopped" operation_key="group-1_stopped_0"/>
+        <pseudo_event id="44" operation="stopped" operation_key="group-1_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="89" operation="promoted" operation_key="master-1_promoted_0"/>
+        <pseudo_event id="90" operation="promoted" operation_key="master-1_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="33" operation="monitor" operation_key="r192.168.101.181_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="34" operation="monitor" operation_key="r192.168.101.181_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="33" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="32" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="33" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.181" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.181"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="r192.168.101.181_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="r192.168.101.181_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <pseudo_event id="31" operation="stop" operation_key="r192.168.101.181_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="r192.168.101.181_stop_0">
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.181"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="r192.168.101.182_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="r192.168.101.182_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="43" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="36" operation="monitor" operation_key="r192.168.101.182_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="37" operation="monitor" operation_key="r192.168.101.182_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.182" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.182"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="36" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="35" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="36" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.182" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.182"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="33" operation="start" operation_key="r192.168.101.181_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="r192.168.101.182_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="r192.168.101.182_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="34" operation="stop" operation_key="r192.168.101.182_stop_0">
+      <pseudo_event id="35" operation="stop" operation_key="r192.168.101.182_stop_0">
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.182"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="r192.168.101.183_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="group-1_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="r192.168.101.183_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="43" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="39" operation="monitor" operation_key="r192.168.101.183_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="40" operation="monitor" operation_key="r192.168.101.183_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="39" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="38" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="39" operation="start" operation_key="r192.168.101.183_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="r192.168.101.183" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.183"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="35" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="36" operation="start" operation_key="r192.168.101.182_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="r192.168.101.183_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="r192.168.101.183_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="start" operation_key="group-1_start_0"/>
+        <pseudo_event id="41" operation="start" operation_key="group-1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <pseudo_event id="37" operation="stop" operation_key="r192.168.101.183_stop_0">
+      <pseudo_event id="38" operation="stop" operation_key="r192.168.101.183_stop_0">
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.183"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="42" operation="stop" operation_key="group-1_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="43" operation="stop" operation_key="group-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="52" operation="monitor" operation_key="rsc_pcmk-4_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
+      <rsc_op id="53" operation="monitor" operation_key="rsc_pcmk-4_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="rsc_pcmk-4" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-2" CRM_meta_on_node_uuid="pcmk-2" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.187"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="51" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
+        <rsc_op id="52" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="51" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
+      <rsc_op id="52" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="rsc_pcmk-4" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="pcmk-2" CRM_meta_on_node_uuid="pcmk-2" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.187"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_pcmk-4_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_pcmk-4_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <pseudo_event id="50" operation="stop" operation_key="rsc_pcmk-4_stop_0">
+      <pseudo_event id="51" operation="stop" operation_key="rsc_pcmk-4_stop_0">
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.101.187"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="55" operation="monitor" operation_key="lsb-dummy_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="56" operation="monitor" operation_key="lsb-dummy_monitor_5000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="lsb-dummy" class="lsb" type="/usr/share/pacemaker/tests/cts/LSBDummy"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="54" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="55" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <rsc_op id="54" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="55" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="lsb-dummy" class="lsb" type="/usr/share/pacemaker/tests/cts/LSBDummy"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="41" operation="running" operation_key="group-1_running_0"/>
+        <pseudo_event id="42" operation="running" operation_key="group-1_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="53" operation="stop" operation_key="lsb-dummy_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="lsb-dummy_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="53" operation="stop" operation_key="lsb-dummy_stop_0">
+      <pseudo_event id="54" operation="stop" operation_key="lsb-dummy_stop_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <rsc_op id="60" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3">
+      <rsc_op id="61" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3">
         <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_migrate_source="pcmk-1" CRM_meta_migrate_target="pcmk-3" CRM_meta_on_node="pcmk-3" CRM_meta_on_node_uuid="pcmk-3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="59" operation="migrate_to" operation_key="migrator_migrate_to_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="60" operation="migrate_to" operation_key="migrator_migrate_to_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <rsc_op id="59" operation="migrate_to" operation_key="migrator_migrate_to_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="60" operation="migrate_to" operation_key="migrator_migrate_to_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_migrate_source="pcmk-1" CRM_meta_migrate_target="pcmk-3" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_record_pending="true" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <rsc_op id="58" operation="monitor" operation_key="migrator_monitor_10000" on_node="pcmk-3" on_node_uuid="pcmk-3">
+      <rsc_op id="59" operation="monitor" operation_key="migrator_monitor_10000" on_node="pcmk-3" on_node_uuid="pcmk-3">
         <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-3" CRM_meta_on_node_uuid="pcmk-3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="57" operation="start" operation_key="migrator_start_0"/>
+        <pseudo_event id="58" operation="start" operation_key="migrator_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <pseudo_event id="57" operation="start" operation_key="migrator_start_0">
+      <pseudo_event id="58" operation="start" operation_key="migrator_start_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="56" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="57" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <rsc_op id="60" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3"/>
+        <rsc_op id="61" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="56" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="57" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="migrator" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="60" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3"/>
+        <rsc_op id="61" operation="migrate_from" operation_key="migrator_migrate_from_0" on_node="pcmk-3" on_node_uuid="pcmk-3"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <pseudo_event id="61" operation="stop" operation_key="ping-1:0_stop_0">
+      <pseudo_event id="62" operation="stop" operation_key="ping-1:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000"  debug="true" host_list="192.168.9.161" name="connected"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="70" operation="stop" operation_key="Connectivity_stop_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="71" operation="stop" operation_key="Connectivity_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28" priority="1000000">
     <action_set>
-      <pseudo_event id="71" operation="stopped" operation_key="Connectivity_stopped_0">
+      <pseudo_event id="72" operation="stopped" operation_key="Connectivity_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="61" operation="stop" operation_key="ping-1:0_stop_0"/>
+        <pseudo_event id="62" operation="stop" operation_key="ping-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="70" operation="stop" operation_key="Connectivity_stop_0"/>
+        <pseudo_event id="71" operation="stop" operation_key="Connectivity_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="70" operation="stop" operation_key="Connectivity_stop_0">
+      <pseudo_event id="71" operation="stop" operation_key="Connectivity_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <pseudo_event id="73" operation="stop" operation_key="stateful-1:0_stop_0">
+      <pseudo_event id="74" operation="stop" operation_key="stateful-1:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="72" operation="demote" operation_key="stateful-1:0_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <pseudo_event id="86" operation="stop" operation_key="master-1_stop_0"/>
+        <pseudo_event id="73" operation="demote" operation_key="stateful-1:0_demote_0"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="87" operation="stop" operation_key="master-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="72" operation="demote" operation_key="stateful-1:0_demote_0">
+      <pseudo_event id="73" operation="demote" operation_key="stateful-1:0_demote_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="90" operation="demote" operation_key="master-1_demote_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="91" operation="demote" operation_key="master-1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="32">
     <action_set>
-      <rsc_op id="77" operation="monitor" operation_key="stateful-1:1_monitor_16000" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="78" operation="monitor" operation_key="stateful-1:1_monitor_16000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="stateful-1" long-id="stateful-1:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="16000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="77" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="33">
     <action_set>
-      <rsc_op id="76" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
+      <rsc_op id="77" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="stateful-1" long-id="stateful-1:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" 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="false" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="pcmk-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="88" operation="promote" operation_key="master-1_promote_0"/>
+        <pseudo_event id="89" operation="promote" operation_key="master-1_promote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="34">
     <action_set>
-      <rsc_op id="80" operation="monitor" operation_key="stateful-1:3_monitor_15000" internal_operation_key="stateful-1:2_monitor_15000" on_node="pcmk-3" on_node_uuid="pcmk-3">
+      <rsc_op id="81" operation="monitor" operation_key="stateful-1:3_monitor_15000" internal_operation_key="stateful-1:2_monitor_15000" on_node="pcmk-3" on_node_uuid="pcmk-3">
         <primitive id="stateful-1" long-id="stateful-1:3" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="pcmk-3" CRM_meta_on_node_uuid="pcmk-3" CRM_meta_timeout="60000" />
       </rsc_op>
@@ -536,7 +536,7 @@
   </synapse>
   <synapse id="35">
     <action_set>
-      <rsc_op id="83" operation="monitor" operation_key="stateful-1:2_monitor_15000" internal_operation_key="stateful-1:3_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2">
+      <rsc_op id="84" operation="monitor" operation_key="stateful-1:2_monitor_15000" internal_operation_key="stateful-1:3_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="stateful-1" long-id="stateful-1:2" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="pcmk-2" CRM_meta_on_node_uuid="pcmk-2" CRM_meta_timeout="60000" />
       </rsc_op>
@@ -545,149 +545,148 @@
   </synapse>
   <synapse id="36" priority="1000000">
     <action_set>
-      <pseudo_event id="91" operation="demoted" operation_key="master-1_demoted_0">
+      <pseudo_event id="92" operation="demoted" operation_key="master-1_demoted_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="72" operation="demote" operation_key="stateful-1:0_demote_0"/>
+        <pseudo_event id="73" operation="demote" operation_key="stateful-1:0_demote_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="90" operation="demote" operation_key="master-1_demote_0"/>
+        <pseudo_event id="91" operation="demote" operation_key="master-1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="37">
     <action_set>
-      <pseudo_event id="90" operation="demote" operation_key="master-1_demote_0">
+      <pseudo_event id="91" operation="demote" operation_key="master-1_demote_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="43" operation="stopped" operation_key="group-1_stopped_0"/>
+        <pseudo_event id="44" operation="stopped" operation_key="group-1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="38" priority="1000000">
     <action_set>
-      <pseudo_event id="89" operation="promoted" operation_key="master-1_promoted_0">
+      <pseudo_event id="90" operation="promoted" operation_key="master-1_promoted_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="76" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="77" operation="promote" operation_key="stateful-1:1_promote_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="39">
     <action_set>
-      <pseudo_event id="88" operation="promote" operation_key="master-1_promote_0">
+      <pseudo_event id="89" operation="promote" operation_key="master-1_promote_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="87" operation="stopped" operation_key="master-1_stopped_0"/>
+        <pseudo_event id="88" operation="stopped" operation_key="master-1_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="91" operation="demoted" operation_key="master-1_demoted_0"/>
+        <pseudo_event id="92" operation="demoted" operation_key="master-1_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="40" priority="1000000">
     <action_set>
-      <pseudo_event id="87" operation="stopped" operation_key="master-1_stopped_0">
+      <pseudo_event id="88" operation="stopped" operation_key="master-1_stopped_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="stateful-1:0_stop_0"/>
+        <pseudo_event id="74" operation="stop" operation_key="stateful-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="86" operation="stop" operation_key="master-1_stop_0"/>
+        <pseudo_event id="87" operation="stop" operation_key="master-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="41">
     <action_set>
-      <pseudo_event id="86" operation="stop" operation_key="master-1_stop_0">
+      <pseudo_event id="87" operation="stop" operation_key="master-1_stop_0">
         <attributes CRM_meta_clone_max="4" 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="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="91" operation="demoted" operation_key="master-1_demoted_0"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <pseudo_event id="92" operation="demoted" operation_key="master-1_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="42">
     <action_set>
-      <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4">
-        <attributes CRM_meta_connected="1" CRM_meta_on_node="pcmk-4" CRM_meta_on_node_uuid="pcmk-4" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" CRM_meta_terminate="1" />
-        <downed>
-          <node id="pcmk-4"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="43">
-    <action_set>
-      <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="93" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="44">
+  <synapse id="43">
     <action_set>
-      <pseudo_event id="19" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="20" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="20" operation="stop" operation_key="FencingChild:0_stop_0"/>
+        <pseudo_event id="21" operation="stop" operation_key="FencingChild:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="31" operation="stop" operation_key="r192.168.101.181_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="r192.168.101.181_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="34" operation="stop" operation_key="r192.168.101.182_stop_0"/>
+        <pseudo_event id="35" operation="stop" operation_key="r192.168.101.182_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="37" operation="stop" operation_key="r192.168.101.183_stop_0"/>
+        <pseudo_event id="38" operation="stop" operation_key="r192.168.101.183_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="50" operation="stop" operation_key="rsc_pcmk-4_stop_0"/>
+        <pseudo_event id="51" operation="stop" operation_key="rsc_pcmk-4_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="53" operation="stop" operation_key="lsb-dummy_stop_0"/>
+        <pseudo_event id="54" operation="stop" operation_key="lsb-dummy_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="56" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+        <rsc_op id="57" operation="stop" operation_key="migrator_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="61" operation="stop" operation_key="ping-1:0_stop_0"/>
+        <pseudo_event id="62" operation="stop" operation_key="ping-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="stateful-1:0_stop_0"/>
+        <pseudo_event id="74" operation="stop" operation_key="stateful-1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="92" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="93" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="44">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-pcmk-4-reboot" on_node="pcmk-4" on_node_uuid="pcmk-4">
+        <attributes CRM_meta_connected="1" CRM_meta_on_node="pcmk-4" CRM_meta_on_node_uuid="pcmk-4" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" CRM_meta_terminate="1" />
+        <downed>
+          <node id="pcmk-4"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/migrate-fencing.scores b/pengine/test10/migrate-fencing.scores
index 37d42b4..3febd69 100644
--- a/pengine/test10/migrate-fencing.scores
+++ b/pengine/test10/migrate-fencing.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   pcmk-4: node is unclean
 Allocation scores:
 clone_color: Connectivity allocation score on pcmk-1: 0
 clone_color: Connectivity allocation score on pcmk-2: 0
diff --git a/pengine/test10/migrate-fencing.summary b/pengine/test10/migrate-fencing.summary
index fdb905e..7468fe2 100644
--- a/pengine/test10/migrate-fencing.summary
+++ b/pengine/test10/migrate-fencing.summary
@@ -21,9 +21,8 @@ Online: [ pcmk-1 pcmk-2 pcmk-3 ]
      Masters: [ pcmk-4 ]
      Slaves: [ pcmk-1 pcmk-2 pcmk-3 ]
 
-  notice: Fencing   pcmk-4: node is unclean
 Transition Summary:
- * Fence (reboot) pcmk-4
+ * Fence (reboot) pcmk-4 'termination was requested'
  * Stop    FencingChild:0	(pcmk-4)
  * Move    r192.168.101.181	(Started pcmk-4 -> pcmk-1)
  * Move    r192.168.101.182	(Started pcmk-4 -> pcmk-1)
@@ -39,27 +38,27 @@ Executing cluster transition:
  * Resource action: stateful-1:3    monitor=15000 on pcmk-3
  * Resource action: stateful-1:2    monitor=15000 on pcmk-2
  * Fencing pcmk-4 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   Fencing_stop_0
  * Pseudo action:   rsc_pcmk-4_stop_0
  * Pseudo action:   lsb-dummy_stop_0
- * Resource action: migrator        migrate_to on pcmk-1
  * Pseudo action:   Connectivity_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   FencingChild:0_stop_0
  * Pseudo action:   Fencing_stopped_0
  * Pseudo action:   group-1_stop_0
  * Pseudo action:   r192.168.101.183_stop_0
  * Resource action: rsc_pcmk-4      start on pcmk-2
- * Resource action: migrator        migrate_from on pcmk-3
- * Resource action: migrator        stop on pcmk-1
+ * Resource action: migrator        migrate_to on pcmk-1
  * Pseudo action:   ping-1:0_stop_0
  * Pseudo action:   Connectivity_stopped_0
  * Pseudo action:   r192.168.101.182_stop_0
  * Resource action: rsc_pcmk-4      monitor=5000 on pcmk-2
- * Pseudo action:   migrator_start_0
+ * Resource action: migrator        migrate_from on pcmk-3
+ * Resource action: migrator        stop on pcmk-1
  * Pseudo action:   r192.168.101.181_stop_0
- * Resource action: migrator        monitor=10000 on pcmk-3
+ * Pseudo action:   migrator_start_0
  * Pseudo action:   group-1_stopped_0
+ * Resource action: migrator        monitor=10000 on pcmk-3
  * Pseudo action:   master-1_demote_0
  * Pseudo action:   stateful-1:0_demote_0
  * Pseudo action:   master-1_demoted_0
diff --git a/pengine/test10/rec-node-10.exp b/pengine/test10/rec-node-10.exp
index 309764a..a0606d9 100644
--- a/pengine/test10/rec-node-10.exp
+++ b/pengine/test10/rec-node-10.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>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -10,7 +10,7 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -19,7 +19,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp
index 473c1a7..6c7efcc 100644
--- a/pengine/test10/rec-node-11.exp
+++ b/pengine/test10/rec-node-11.exp
@@ -1,23 +1,23 @@
 <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="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -26,113 +26,113 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <pseudo_event id="13" operation="stopped" operation_key="group1_stopped_0">
+      <pseudo_event id="14" operation="stopped" operation_key="group1_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
+        <pseudo_event id="13" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="12" operation="stop" operation_key="group1_stop_0">
+      <pseudo_event id="13" operation="stop" operation_key="group1_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="17" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="11" operation="running" operation_key="group1_running_0">
+      <pseudo_event id="12" operation="running" operation_key="group1_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
+        <pseudo_event id="11" operation="start" operation_key="group1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="10" operation="start" operation_key="group1_start_0">
+      <pseudo_event id="11" operation="start" operation_key="group1_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stopped" operation_key="group1_stopped_0"/>
+        <pseudo_event id="14" operation="stopped" operation_key="group1_stopped_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="16" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
+        <pseudo_event id="11" operation="start" operation_key="group1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="17" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="17" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <pseudo_event id="13" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -141,50 +141,50 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="start" operation_key="group1_start_0"/>
+        <pseudo_event id="11" operation="start" operation_key="group1_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="17" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <crm_event id="17" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <pseudo_event id="13" operation="stop" operation_key="group1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -193,76 +193,75 @@
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="15" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="16" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc3" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="15" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="17" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="14" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="15" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc3" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stopped" operation_key="group1_stopped_0"/>
+        <pseudo_event id="14" operation="stopped" operation_key="group1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <crm_event id="17" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="15">
-    <action_set>
-      <pseudo_event id="16" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="17" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="17" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16">
+  <synapse id="15">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="14" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="15" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="17" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="16">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-node-11.scores b/pengine/test10/rec-node-11.scores
index 86c2bf5..482deeb 100644
--- a/pengine/test10/rec-node-11.scores
+++ b/pengine/test10/rec-node-11.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary
index f45f0a8..e884ffa 100644
--- a/pengine/test10/rec-node-11.summary
+++ b/pengine/test10/rec-node-11.summary
@@ -9,9 +9,8 @@ Online: [ node2 ]
      rsc2	(heartbeat:apache):	Started node1
  rsc3	(heartbeat:apache):	Started node2
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'peer process is no longer available'
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
@@ -22,9 +21,9 @@ Executing cluster transition:
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node2
  * Fencing node1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   group1_stop_0
  * Pseudo action:   rsc2_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   group1_stopped_0
  * Resource action: rsc3            stop on node2
diff --git a/pengine/test10/rec-node-12.scores b/pengine/test10/rec-node-12.scores
index 4fd9ff5..153c232 100644
--- a/pengine/test10/rec-node-12.scores
+++ b/pengine/test10/rec-node-12.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c001n02: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n01: 0
 clone_color: DoFencing allocation score on c001n02: 0
diff --git a/pengine/test10/rec-node-12.summary b/pengine/test10/rec-node-12.summary
index 562cae9..8b2d4e6 100644
--- a/pengine/test10/rec-node-12.summary
+++ b/pengine/test10/rec-node-12.summary
@@ -14,9 +14,8 @@ Online: [ c001n01 c001n03 c001n08 ]
      child_DoFencing:2	(stonith:ssh):	Stopped 
      child_DoFencing:3	(stonith:ssh):	Stopped 
 
-  notice: Fencing   c001n02: node is unclean
 Transition Summary:
- * Fence (reboot) c001n02
+ * Fence (reboot) c001n02 'node is unclean'
  * Start   DcIPaddr	(c001n08)
  * Start   rsc_c001n08	(c001n08)
  * Start   rsc_c001n02	(c001n01)
diff --git a/pengine/test10/rec-node-13.exp b/pengine/test10/rec-node-13.exp
index 3b25e9f..a289600 100644
--- a/pengine/test10/rec-node-13.exp
+++ b/pengine/test10/rec-node-13.exp
@@ -1,83 +1,82 @@
  <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
    <synapse id="0">
      <action_set>
-      <pseudo_event id="66" operation="stop" operation_key="ocf_msdummy:6_stop_0">
+      <pseudo_event id="67" operation="stop" operation_key="ocf_msdummy:6_stop_0">
         <attributes CRM_meta_clone="6" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="6" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  logfile="/var/log/cts_ocfdummy.log"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
-        <crm_event id="80" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <pseudo_event id="74" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1" priority="1000000">
      <action_set>
-      <pseudo_event id="74" operation="stopped" operation_key="master_rsc_1_stopped_0">
+      <pseudo_event id="75" operation="stopped" operation_key="master_rsc_1_stopped_0">
         <attributes CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="6" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="66" operation="stop" operation_key="ocf_msdummy:6_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="ocf_msdummy:6_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="73" operation="stop" operation_key="master_rsc_1_stop_0"/>
+        <pseudo_event id="74" operation="stop" operation_key="master_rsc_1_stop_0"/>
       </trigger>
     </inputs>
    </synapse>
   <synapse id="2">
      <action_set>
-      <pseudo_event id="73" operation="stop" operation_key="master_rsc_1_stop_0">
+      <pseudo_event id="74" operation="stop" operation_key="master_rsc_1_stop_0">
         <attributes CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_master_max="6" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="80" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-      <crm_event id="80" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
-        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_shutdown="1234" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
-        </downed>
-      </crm_event>
-     </action_set>
-    <inputs/>
-   </synapse>
-  <synapse id="4">
-     <action_set>
-      <pseudo_event id="79" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="80" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="80" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="4">
     <action_set>
-      <pseudo_event id="21" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="22" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <pseudo_event id="66" operation="stop" operation_key="ocf_msdummy:6_stop_0"/>
+        <pseudo_event id="67" operation="stop" operation_key="ocf_msdummy:6_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="79" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="80" operation="stonith_complete" operation_key="stonith_complete"/>
        </trigger>
      </inputs>
    </synapse>
+  <synapse id="5">
+    <action_set>
+      <crm_event id="2" operation="stonith" operation_key="stonith-c001n04-reboot" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
+        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d" CRM_meta_op_no_wait="true" CRM_meta_probe_complete="true" CRM_meta_shutdown="1234" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
  </transition_graph>
-
diff --git a/pengine/test10/rec-node-13.scores b/pengine/test10/rec-node-13.scores
index bdb5004..dda1134 100644
--- a/pengine/test10/rec-node-13.scores
+++ b/pengine/test10/rec-node-13.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c001n04: node is unclean
 Allocation scores:
 clone_color: DoFencing allocation score on c001n02: 0
 clone_color: DoFencing allocation score on c001n03: 0
diff --git a/pengine/test10/rec-node-13.summary b/pengine/test10/rec-node-13.summary
index d3b4d65..9873757 100644
--- a/pengine/test10/rec-node-13.summary
+++ b/pengine/test10/rec-node-13.summary
@@ -33,15 +33,14 @@ OFFLINE: [ c001n03 c001n05 ]
      ocf_msdummy:10	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n06 
      ocf_msdummy:11	(ocf::heartbeat:/usr/lib/heartbeat/cts/OCFMSDummy):	Slave c001n07 
 
-  notice: Fencing   c001n04: node is unclean
 Transition Summary:
- * Fence (reboot) c001n04
+ * Fence (reboot) c001n04 'ocf_msdummy:6 failed there'
  * Stop    ocf_msdummy:6	(c001n04)
 
 Executing cluster transition:
  * Fencing c001n04 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   master_rsc_1_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   ocf_msdummy:6_stop_0
  * Pseudo action:   master_rsc_1_stopped_0
  * Pseudo action:   all_stopped
diff --git a/pengine/test10/rec-node-14.exp b/pengine/test10/rec-node-14.exp
index 30dbcdb..308ab7e 100644
--- a/pengine/test10/rec-node-14.exp
+++ b/pengine/test10/rec-node-14.exp
@@ -1,68 +1,67 @@
  <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
    <synapse id="0">
      <action_set>
-      <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3">
-        <attributes CRM_meta_on_node="node3" CRM_meta_on_node_uuid="uuid3" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid3"/>
-        </downed>
-      </crm_event>
+      <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete">
+        <attributes />
+      </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
-      <crm_event id="4" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid2"/>
-        </downed>
-      </crm_event>
+      <pseudo_event id="4" operation="all_stopped" operation_key="all_stopped">
+        <attributes />
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="5" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
+        <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <crm_event id="3" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+      <crm_event id="3" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3">
+        <attributes CRM_meta_on_node="node3" CRM_meta_on_node_uuid="uuid3" CRM_meta_stonith_action="reboot" />
         <downed>
-          <node id="uuid1"/>
+          <node id="uuid3"/>
         </downed>
        </crm_event>
      </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+      </trigger>
+    </inputs>
    </synapse>
   <synapse id="3">
      <action_set>
-      <pseudo_event id="2" operation="stonith_complete" operation_key="stonith_complete">
-        <attributes />
-      </pseudo_event>
+      <crm_event id="2" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_no_wait="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid2"/>
+        </downed>
+      </crm_event>
      </action_set>
      <inputs>
        <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="3" operation="stonith" operation_key="stonith-node3-reboot" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
-      </pseudo_event>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
      </action_set>
-     <inputs>
-       <trigger>
-        <pseudo_event id="2" operation="stonith_complete" operation_key="stonith_complete"/>
-       </trigger>
-     </inputs>
+    <inputs/>
    </synapse>
  </transition_graph>
-
diff --git a/pengine/test10/rec-node-14.scores b/pengine/test10/rec-node-14.scores
index 1be723e..0322231 100644
--- a/pengine/test10/rec-node-14.scores
+++ b/pengine/test10/rec-node-14.scores
@@ -1,6 +1,3 @@
-  notice: Fencing   node1: node is unclean
-  notice: Fencing   node2: node is unclean
-  notice: Fencing   node3: node is unclean
 Allocation scores:
 native_color: lsb_dummy allocation score on node1: 0
 native_color: lsb_dummy allocation score on node2: 0
diff --git a/pengine/test10/rec-node-14.summary b/pengine/test10/rec-node-14.summary
index a707aee..b5f105e 100644
--- a/pengine/test10/rec-node-14.summary
+++ b/pengine/test10/rec-node-14.summary
@@ -7,13 +7,10 @@ Node node3 (uuid3): UNCLEAN (offline)
  stonith-1	(stonith:dummy):	Stopped 
  lsb_dummy	(lsb:/usr/lib/heartbeat/cts/LSBDummy):	Stopped 
 
-  notice: Fencing   node1: node is unclean
-  notice: Fencing   node2: node is unclean
-  notice: Fencing   node3: node is unclean
 Transition Summary:
- * Fence (reboot) node3
- * Fence (reboot) node2
- * Fence (reboot) node1
+ * Fence (reboot) node3 'peer is no longer part of the cluster'
+ * Fence (reboot) node2 'peer is no longer part of the cluster'
+ * Fence (reboot) node1 'peer is no longer part of the cluster'
 
 Executing cluster transition:
  * Fencing node1 (reboot)
diff --git a/pengine/test10/rec-node-15.exp b/pengine/test10/rec-node-15.exp
index 3810636..3cd3e81 100644
--- a/pengine/test10/rec-node-15.exp
+++ b/pengine/test10/rec-node-15.exp
@@ -1,26 +1,26 @@
 <transition_graph cluster-delay="5min" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="10" operation="start" operation_key="stonith-1_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="11" operation="start" operation_key="stonith-1_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="9" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="10" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
+      <rsc_op id="10" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="sapcl02" CRM_meta_on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -29,7 +29,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="9" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -38,28 +38,28 @@
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="33" operation="stopped" operation_key="app02_stopped_0">
+      <pseudo_event id="34" operation="stopped" operation_key="app02_stopped_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="21" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="22" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="25" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="28" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stop" operation_key="app02_stop_0"/>
+        <pseudo_event id="33" operation="stop" operation_key="app02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <pseudo_event id="32" operation="stop" operation_key="app02_stop_0">
+      <pseudo_event id="33" operation="stop" operation_key="app02_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -67,214 +67,214 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="31" operation="running" operation_key="app02_running_0">
+      <pseudo_event id="32" operation="running" operation_key="app02_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="23" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="25" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="26" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="28" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="29" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="start" operation_key="app02_start_0"/>
+        <pseudo_event id="31" operation="start" operation_key="app02_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="30" operation="start" operation_key="app02_start_0">
+      <pseudo_event id="31" operation="start" operation_key="app02_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="33" operation="stopped" operation_key="app02_stopped_0"/>
+        <pseudo_event id="34" operation="stopped" operation_key="app02_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="23" operation="monitor" operation_key="IPaddr_192_168_1_102_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="24" operation="monitor" operation_key="IPaddr_192_168_1_102_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="5000"  ip="192.168.1.102"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="23" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="22" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="23" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  ip="192.168.1.102"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="21" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="22" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="start" operation_key="app02_start_0"/>
+        <pseudo_event id="31" operation="start" operation_key="app02_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="21" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
+      <rsc_op id="22" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
         <primitive id="IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="sapcl02" CRM_meta_on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181" CRM_meta_timeout="20000"  ip="192.168.1.102"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="25" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stop" operation_key="app02_stop_0"/>
+        <pseudo_event id="33" operation="stop" operation_key="app02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="26" operation="monitor" operation_key="LVM_12_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="27" operation="monitor" operation_key="LVM_12_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  volgrpname="data02vg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="25" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="26" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="25" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="26" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  volgrpname="data02vg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="22" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="23" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="25" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="start" operation_key="app02_start_0"/>
+        <pseudo_event id="31" operation="start" operation_key="app02_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="24" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
+      <rsc_op id="25" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
         <primitive id="LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
         <attributes CRM_meta_on_node="sapcl02" CRM_meta_on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181" CRM_meta_timeout="20000"  volgrpname="data02vg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="28" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="32" operation="stop" operation_key="app02_stop_0"/>
+        <pseudo_event id="33" operation="stop" operation_key="app02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="29" operation="monitor" operation_key="Filesystem_13_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="30" operation="monitor" operation_key="Filesystem_13_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  device="/dev/data02vg/v0" directory="/data/d2" fstype="ext3"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="28" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="29" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="28" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="29" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  device="/dev/data02vg/v0" directory="/data/d2" fstype="ext3"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="25" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="26" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="28" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="start" operation_key="app02_start_0"/>
+        <pseudo_event id="31" operation="start" operation_key="app02_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="27" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
+      <rsc_op id="28" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
         <primitive id="Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
         <attributes CRM_meta_on_node="sapcl02" CRM_meta_on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181" CRM_meta_timeout="20000"  device="/dev/data02vg/v0" directory="/data/d2" fstype="ext3"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="32" operation="stop" operation_key="app02_stop_0"/>
+        <pseudo_event id="33" operation="stop" operation_key="app02_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <pseudo_event id="45" operation="running" operation_key="oracle_running_0">
+      <pseudo_event id="46" operation="running" operation_key="oracle_running_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="35" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="36" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="37" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="39" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="41" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <rsc_op id="42" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="43" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="44" operation="start" operation_key="oracle_start_0">
+      <pseudo_event id="45" operation="start" operation_key="oracle_start_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
@@ -282,204 +282,203 @@
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="35" operation="monitor" operation_key="IPaddr_192_168_1_104_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="36" operation="monitor" operation_key="IPaddr_192_168_1_104_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="IPaddr_192_168_1_104" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="5000"  ip="192.168.1.104"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="35" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <rsc_op id="34" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="35" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="IPaddr_192_168_1_104" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  ip="192.168.1.104"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="20">
     <action_set>
-      <rsc_op id="37" operation="monitor" operation_key="LVM_22_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="38" operation="monitor" operation_key="LVM_22_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="LVM_22" class="ocf" provider="heartbeat" type="LVM"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  volgrpname="data03vg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="36" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="37" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <rsc_op id="36" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="37" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="LVM_22" class="ocf" provider="heartbeat" type="LVM"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  volgrpname="data03vg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="35" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
-      <rsc_op id="39" operation="monitor" operation_key="Filesystem_23_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="40" operation="monitor" operation_key="Filesystem_23_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  device="/dev/data03vg/v0" directory="/data/d3" fstype="xfs"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="39" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <rsc_op id="38" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="39" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  device="/dev/data03vg/v0" directory="/data/d3" fstype="xfs"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="36" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="37" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24">
     <action_set>
-      <rsc_op id="41" operation="monitor" operation_key="oracle_24_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="42" operation="monitor" operation_key="oracle_24_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="oracle_24" class="ocf" provider="heartbeat" type="oracle"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  sid="testdb"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="40" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="41" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <rsc_op id="40" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="41" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="oracle_24" class="ocf" provider="heartbeat" type="oracle"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  sid="testdb"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="38" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="39" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="43" operation="monitor" operation_key="oralsnr_25_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="44" operation="monitor" operation_key="oralsnr_25_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"/>
         <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="60000"  sid="testdb"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="42" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="43" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <rsc_op id="42" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+      <rsc_op id="43" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
         <primitive id="oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"/>
         <attributes CRM_meta_on_node="sapcl01" CRM_meta_on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d" CRM_meta_timeout="20000"  sid="testdb"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="40" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+        <rsc_op id="41" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
       </trigger>
       <trigger>
-        <pseudo_event id="44" operation="start" operation_key="oracle_start_0"/>
+        <pseudo_event id="45" operation="start" operation_key="oracle_start_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <crm_event id="49" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
-        <attributes CRM_meta_on_node="sapcl03" CRM_meta_on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750" CRM_meta_op_no_wait="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="29">
-    <action_set>
-      <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="49" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="30">
+  <synapse id="29">
     <action_set>
-      <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="21" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="22" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="25" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <rsc_op id="27" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+        <rsc_op id="28" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
       </trigger>
       <trigger>
-        <pseudo_event id="48" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="30">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-sapcl03-reboot" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
+        <attributes CRM_meta_on_node="sapcl03" CRM_meta_on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750" CRM_meta_op_no_wait="true" CRM_meta_standby="off" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-node-15.scores b/pengine/test10/rec-node-15.scores
index d8b9617..03dc6e6 100644
--- a/pengine/test10/rec-node-15.scores
+++ b/pengine/test10/rec-node-15.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   sapcl03: node is unclean
 Allocation scores:
 group_color: Filesystem_13 allocation score on sapcl01: 0
 group_color: Filesystem_13 allocation score on sapcl02: 0
diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary
index 863bfd4..760942c 100644
--- a/pengine/test10/rec-node-15.summary
+++ b/pengine/test10/rec-node-15.summary
@@ -20,9 +20,8 @@ Online: [ sapcl01 ]
      oracle_24	(ocf::heartbeat:oracle):	Stopped 
      oralsnr_25	(ocf::heartbeat:oralsnr):	Stopped 
 
-  notice: Fencing   sapcl03: node is unclean
 Transition Summary:
- * Fence (reboot) sapcl03
+ * Fence (reboot) sapcl03 'peer is no longer part of the cluster'
  * Start   stonith-1	(sapcl01)
  * Move    IPaddr_192_168_1_102	(Started sapcl02 -> sapcl01)
  * Move    LVM_12	(Started sapcl02 -> sapcl01)
@@ -40,20 +39,14 @@ Executing cluster transition:
  * Resource action: Filesystem_13   stop on sapcl02
  * Pseudo action:   oracle_start_0
  * Fencing sapcl03 (reboot)
- * Pseudo action:   stonith_complete
  * Resource action: LVM_12          stop on sapcl02
+ * Pseudo action:   stonith_complete
+ * Resource action: IPaddr_192_168_1_102 stop on sapcl02
  * Resource action: IPaddr_192_168_1_104 start on sapcl01
  * Resource action: LVM_22          start on sapcl01
  * Resource action: Filesystem_23   start on sapcl01
  * Resource action: oracle_24       start on sapcl01
  * Resource action: oralsnr_25      start on sapcl01
- * Resource action: IPaddr_192_168_1_102 stop on sapcl02
- * Pseudo action:   oracle_running_0
- * Resource action: IPaddr_192_168_1_104 monitor=5000 on sapcl01
- * Resource action: LVM_22          monitor=120000 on sapcl01
- * Resource action: Filesystem_23   monitor=120000 on sapcl01
- * Resource action: oracle_24       monitor=120000 on sapcl01
- * Resource action: oralsnr_25      monitor=120000 on sapcl01
  * Pseudo action:   all_stopped
  * Resource action: stonith-1       start on sapcl01
  * Pseudo action:   app02_stopped_0
@@ -61,6 +54,12 @@ Executing cluster transition:
  * Resource action: IPaddr_192_168_1_102 start on sapcl01
  * Resource action: LVM_12          start on sapcl01
  * Resource action: Filesystem_13   start on sapcl01
+ * Pseudo action:   oracle_running_0
+ * Resource action: IPaddr_192_168_1_104 monitor=5000 on sapcl01
+ * Resource action: LVM_22          monitor=120000 on sapcl01
+ * Resource action: Filesystem_23   monitor=120000 on sapcl01
+ * Resource action: oracle_24       monitor=120000 on sapcl01
+ * Resource action: oralsnr_25      monitor=120000 on sapcl01
  * Pseudo action:   app02_running_0
  * Resource action: IPaddr_192_168_1_102 monitor=5000 on sapcl01
  * Resource action: LVM_12          monitor=120000 on sapcl01
diff --git a/pengine/test10/rec-node-2.scores b/pengine/test10/rec-node-2.scores
index 6efa92d..68e176f 100644
--- a/pengine/test10/rec-node-2.scores
+++ b/pengine/test10/rec-node-2.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 group_color: group1 allocation score on node1: 0
 group_color: group1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-2.summary b/pengine/test10/rec-node-2.summary
index ecf6562..4106abf 100644
--- a/pengine/test10/rec-node-2.summary
+++ b/pengine/test10/rec-node-2.summary
@@ -13,9 +13,8 @@ Online: [ node2 ]
      rsc5	(heartbeat:apache):	Stopped 
      rsc6	(heartbeat:apache):	Stopped 
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'node is unclean'
  * Start   stonith-1	(node2)
  * Start   rsc1	(node2)
  * Start   rsc2	(node2)
diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp
index 00f975e..2aaa34b 100644
--- a/pengine/test10/rec-node-4.exp
+++ b/pengine/test10/rec-node-4.exp
@@ -1,23 +1,23 @@
 <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="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -26,41 +26,41 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -69,41 +69,41 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -112,44 +112,43 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="9">
-    <action_set>
-      <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="10">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-node-4.scores b/pengine/test10/rec-node-4.scores
index e25a30f..1d008ec 100644
--- a/pengine/test10/rec-node-4.scores
+++ b/pengine/test10/rec-node-4.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary
index f46a3bb..4a39615 100644
--- a/pengine/test10/rec-node-4.summary
+++ b/pengine/test10/rec-node-4.summary
@@ -7,9 +7,8 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1 (UNCLEAN)
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'peer is no longer part of the cluster'
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
@@ -19,9 +18,9 @@ Executing cluster transition:
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node2
  * Fencing node1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
  * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
diff --git a/pengine/test10/rec-node-5.exp b/pengine/test10/rec-node-5.exp
index abae4db..7099236 100644
--- a/pengine/test10/rec-node-5.exp
+++ b/pengine/test10/rec-node-5.exp
@@ -1,20 +1,20 @@
  <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="4" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="1">
      <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
@@ -23,20 +23,20 @@
    </synapse>
   <synapse id="2">
      <action_set>
-      <rsc_op id="5" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="3">
      <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp
index 00f975e..2aaa34b 100644
--- a/pengine/test10/rec-node-6.exp
+++ b/pengine/test10/rec-node-6.exp
@@ -1,23 +1,23 @@
 <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="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -26,41 +26,41 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -69,41 +69,41 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -112,44 +112,43 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="9">
-    <action_set>
-      <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="10">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-node-6.scores b/pengine/test10/rec-node-6.scores
index e25a30f..1d008ec 100644
--- a/pengine/test10/rec-node-6.scores
+++ b/pengine/test10/rec-node-6.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary
index 37257fe..6cb8d01 100644
--- a/pengine/test10/rec-node-6.summary
+++ b/pengine/test10/rec-node-6.summary
@@ -7,9 +7,8 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1
  rsc2	(heartbeat:apache):	Started node1
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'peer process is no longer available'
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
@@ -19,9 +18,9 @@ Executing cluster transition:
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node2
  * Fencing node1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
  * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp
index 00f975e..2aaa34b 100644
--- a/pengine/test10/rec-node-7.exp
+++ b/pengine/test10/rec-node-7.exp
@@ -1,23 +1,23 @@
 <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="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="start" operation_key="stonith-1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -26,41 +26,41 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -69,41 +69,41 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -112,44 +112,43 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
-        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="9">
-    <action_set>
-      <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="10">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1">
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-node-7.scores b/pengine/test10/rec-node-7.scores
index e25a30f..1d008ec 100644
--- a/pengine/test10/rec-node-7.scores
+++ b/pengine/test10/rec-node-7.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node1: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: -INFINITY
 native_color: rsc1 allocation score on node2: 0
diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary
index f46a3bb..4a39615 100644
--- a/pengine/test10/rec-node-7.summary
+++ b/pengine/test10/rec-node-7.summary
@@ -7,9 +7,8 @@ Online: [ node2 ]
  rsc1	(heartbeat:apache):	Started node1 (UNCLEAN)
  rsc2	(heartbeat:apache):	Started node1 (UNCLEAN)
 
-  notice: Fencing   node1: node is unclean
 Transition Summary:
- * Fence (reboot) node1
+ * Fence (reboot) node1 'peer is no longer part of the cluster'
  * Start   stonith-1	(node2)
  * Move    rsc1	(Started node1 -> node2)
  * Move    rsc2	(Started node1 -> node2)
@@ -19,9 +18,9 @@ Executing cluster transition:
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node2
  * Fencing node1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
  * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
diff --git a/pengine/test10/rec-node-8.exp b/pengine/test10/rec-node-8.exp
index 78a972c..334e62a 100644
--- a/pengine/test10/rec-node-8.exp
+++ b/pengine/test10/rec-node-8.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>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -10,7 +10,7 @@
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -19,7 +19,7 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
@@ -28,7 +28,7 @@
    </synapse>
   <synapse id="3">
      <action_set>
-      <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
+      <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc3" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
index a690d68..b1f151b 100644
--- a/pengine/test10/rec-rsc-5.exp
+++ b/pengine/test10/rec-rsc-5.exp
@@ -1,23 +1,23 @@
 <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="start" operation_key="stonith-1_start_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="6" operation="start" operation_key="stonith-1_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="3" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -26,41 +26,41 @@
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0">
+      <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -69,41 +69,41 @@
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
+      <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc2" class="heartbeat" type="apache"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -112,44 +112,43 @@
   </synapse>
   <synapse id="8">
     <action_set>
-      <crm_event id="11" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
-        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="uuid2"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="9">
-    <action_set>
-      <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="11" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
+        <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/>
+        <pseudo_event id="7" operation="stop" operation_key="rsc1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="rsc2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="10">
+    <action_set>
+      <crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2">
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="uuid2"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
-
diff --git a/pengine/test10/rec-rsc-5.scores b/pengine/test10/rec-rsc-5.scores
index ebaedbd..1c640ae 100644
--- a/pengine/test10/rec-rsc-5.scores
+++ b/pengine/test10/rec-rsc-5.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   node2: node is unclean
 Allocation scores:
 native_color: rsc1 allocation score on node1: 0
 native_color: rsc1 allocation score on node2: -INFINITY
diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary
index 6bc4010..28e29b5 100644
--- a/pengine/test10/rec-rsc-5.summary
+++ b/pengine/test10/rec-rsc-5.summary
@@ -7,9 +7,8 @@ Online: [ node1 ]
  rsc1	(heartbeat:apache):	FAILED node2 
  rsc2	(heartbeat:apache):	Started node2
 
-  notice: Fencing   node2: node is unclean
 Transition Summary:
- * Fence (reboot) node2
+ * Fence (reboot) node2 'rsc1 failed there'
  * Start   stonith-1	(node1)
  * Recover rsc1	(Started node2 -> node1)
  * Move    rsc2	(Started node2 -> node1)
@@ -19,9 +18,9 @@ Executing cluster transition:
  * Resource action: rsc1            monitor on node1
  * Resource action: rsc2            monitor on node1
  * Fencing node2 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
+ * Pseudo action:   stonith_complete
  * Pseudo action:   all_stopped
  * Resource action: stonith-1       start on node1
  * Resource action: rsc1            start on node1
diff --git a/pengine/test10/remote-fence-before-reconnect.exp b/pengine/test10/remote-fence-before-reconnect.exp
index 54c9106..736f64f 100644
--- a/pengine/test10/remote-fence-before-reconnect.exp
+++ b/pengine/test10/remote-fence-before-reconnect.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>
-      <rsc_op id="4" operation="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1">
+      <rsc_op id="5" operation="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1">
         <primitive id="c7auto4" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_name="stop" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000"  reconnect_interval="1m"/>
         <downed>
@@ -11,90 +11,90 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="fake2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="fake2_monitor_10000" on_node="c7auto1" on_node_uuid="1">
+      <rsc_op id="16" operation="monitor" operation_key="fake2_monitor_10000" on_node="c7auto1" on_node_uuid="1">
         <primitive id="fake2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1"/>
+        <rsc_op id="15" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="14" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1">
+      <rsc_op id="15" operation="start" operation_key="fake2_start_0" on_node="c7auto1" on_node_uuid="1">
         <primitive id="fake2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_name="start" CRM_meta_on_node="c7auto1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="fake2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0">
+      <pseudo_event id="14" operation="stop" operation_key="fake2_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4">
-        <attributes CRM_meta_on_node="c7auto4" CRM_meta_on_node_uuid="c7auto4" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="c7auto4"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="5">
-    <action_set>
-      <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="23" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
+        <crm_event id="4" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6">
+  <synapse id="5">
     <action_set>
-      <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="9" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="4" operation="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1"/>
+        <rsc_op id="5" operation="stop" operation_key="c7auto4_stop_0" on_node="c7auto1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="fake2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="fake2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="6">
+    <action_set>
+      <crm_event id="4" operation="stonith" operation_key="stonith-c7auto4-reboot" on_node="c7auto4" on_node_uuid="c7auto4">
+        <attributes CRM_meta_on_node="c7auto4" CRM_meta_on_node_uuid="c7auto4" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="c7auto4"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-fence-before-reconnect.scores b/pengine/test10/remote-fence-before-reconnect.scores
index 9423693..fb46919 100644
--- a/pengine/test10/remote-fence-before-reconnect.scores
+++ b/pengine/test10/remote-fence-before-reconnect.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   c7auto4: node is unclean
 Allocation scores:
 native_color: c7auto4 allocation score on c7auto1: -INFINITY
 native_color: c7auto4 allocation score on c7auto2: -INFINITY
diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary
index f477884..7a22551 100644
--- a/pengine/test10/remote-fence-before-reconnect.summary
+++ b/pengine/test10/remote-fence-before-reconnect.summary
@@ -11,16 +11,15 @@ Online: [ c7auto1 c7auto2 c7auto3 ]
  fake4	(ocf::heartbeat:Dummy):	Started c7auto2
  fake5	(ocf::heartbeat:Dummy):	Started c7auto3
 
-  notice: Fencing   c7auto4: node is unclean
 Transition Summary:
- * Fence (reboot) c7auto4
+ * Fence (reboot) c7auto4 'remote connection is unrecoverable'
  * Stop    c7auto4	(c7auto1)
  * Move    fake2	(Started c7auto4 -> c7auto1)
 
 Executing cluster transition:
  * Fencing c7auto4 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   fake2_stop_0
+ * Pseudo action:   stonith_complete
  * Resource action: c7auto4         stop on c7auto1
  * Resource action: fake2           start on c7auto1
  * Pseudo action:   all_stopped
diff --git a/pengine/test10/remote-fence-unclean-3.exp b/pengine/test10/remote-fence-unclean-3.exp
index 2e341bd..5bf7eb3 100644
--- a/pengine/test10/remote-fence-unclean-3.exp
+++ b/pengine/test10/remote-fence-unclean-3.exp
@@ -1,20 +1,20 @@
 <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="47" operation="monitor" operation_key="fence1_monitor_60000" on_node="overcloud-controller-0" on_node_uuid="1">
+      <rsc_op id="48" operation="monitor" operation_key="fence1_monitor_60000" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="fence1" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  multicast_address="225.0.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="46" operation="start" operation_key="fence1_start_0" on_node="overcloud-controller-0" on_node_uuid="1"/>
+        <rsc_op id="47" operation="start" operation_key="fence1_start_0" on_node="overcloud-controller-0" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="46" operation="start" operation_key="fence1_start_0" on_node="overcloud-controller-0" on_node_uuid="1">
+      <rsc_op id="47" operation="start" operation_key="fence1_start_0" on_node="overcloud-controller-0" on_node_uuid="1">
         <primitive id="fence1" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_on_node="overcloud-controller-0" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  multicast_address="225.0.0.2"/>
       </rsc_op>
@@ -75,27 +75,27 @@
   </synapse>
   <synapse id="6">
     <action_set>
-      <crm_event id="185" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0">
-        <attributes CRM_meta_compute_role="true" CRM_meta_on_node="overcloud-novacompute-0" CRM_meta_on_node_uuid="overcloud-novacompute-0" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="overcloud-novacompute-0"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="7">
-    <action_set>
-      <pseudo_event id="184" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="185" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="185" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0"/>
+        <crm_event id="46" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="7">
+    <action_set>
+      <crm_event id="46" operation="stonith" operation_key="stonith-overcloud-novacompute-0-reboot" on_node="overcloud-novacompute-0" on_node_uuid="overcloud-novacompute-0">
+        <attributes CRM_meta_compute_role="true" CRM_meta_on_node="overcloud-novacompute-0" CRM_meta_on_node_uuid="overcloud-novacompute-0" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="overcloud-novacompute-0"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
   <synapse id="8">
     <action_set>
       <pseudo_event id="42" operation="all_stopped" operation_key="all_stopped">
@@ -107,7 +107,7 @@
         <rsc_op id="30" operation="stop" operation_key="overcloud-novacompute-0_stop_0" on_node="overcloud-controller-0" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="184" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="185" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/remote-fence-unclean-3.scores b/pengine/test10/remote-fence-unclean-3.scores
index 283a599..77d71d6 100644
--- a/pengine/test10/remote-fence-unclean-3.scores
+++ b/pengine/test10/remote-fence-unclean-3.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   overcloud-novacompute-0: node is unclean
 Allocation scores:
 clone_color: galera-bundle-master allocation score on galera-bundle-0: 0
 clone_color: galera-bundle-master allocation score on galera-bundle-1: 0
diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary
index ec5d304..6d15598 100644
--- a/pengine/test10/remote-fence-unclean-3.summary
+++ b/pengine/test10/remote-fence-unclean-3.summary
@@ -33,9 +33,8 @@ Containers: [ galera-bundle-0:galera-bundle-docker-0 galera-bundle-1:galera-bund
  Docker container: openstack-cinder-backup [192.168.24.1:8787/tripleoupstream/centos-binary-cinder-backup:latest]
    openstack-cinder-backup-docker-0	(ocf::heartbeat:docker):	Started overcloud-controller-1
 
-  notice: Fencing   overcloud-novacompute-0: node is unclean
 Transition Summary:
- * Fence (reboot) overcloud-novacompute-0
+ * Fence (reboot) overcloud-novacompute-0 'the connection is unrecoverable'
  * Start   fence1	(overcloud-controller-0)
  * Stop    overcloud-novacompute-0	(overcloud-controller-0)
 
diff --git a/pengine/test10/remote-fence-unclean.exp b/pengine/test10/remote-fence-unclean.exp
index d2c3617..3a07384 100644
--- a/pengine/test10/remote-fence-unclean.exp
+++ b/pengine/test10/remote-fence-unclean.exp
@@ -1,23 +1,23 @@
 <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="10" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="11" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="6" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="6" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
         <downed>
@@ -27,7 +27,7 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
@@ -40,83 +40,83 @@
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="10" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="11" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="16" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="15" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="14" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="15" operation="start" operation_key="FAKE2_start_0" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0">
+      <pseudo_event id="14" operation="stop" operation_key="FAKE2_stop_0">
         <attributes CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
+        <crm_event id="5" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="FAKE3_monitor_60000" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="19" operation="monitor" operation_key="FAKE3_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="18" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="17" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="18" operation="start" operation_key="FAKE3_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="17" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="17" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5">
         <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -125,36 +125,36 @@
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="FAKE4_monitor_60000" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="22" operation="monitor" operation_key="FAKE4_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="21" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="20" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="21" operation="start" operation_key="FAKE4_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="20" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="20" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
@@ -163,49 +163,49 @@
   </synapse>
   <synapse id="12">
     <action_set>
-      <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1">
-        <attributes CRM_meta_on_node="remote1" CRM_meta_on_node_uuid="remote1" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
-        <downed>
-          <node id="remote1"/>
-        </downed>
-      </crm_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="13">
-    <action_set>
-      <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="23" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
+        <crm_event id="5" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14">
+  <synapse id="13">
     <action_set>
-      <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="8" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="6" operation="stop" operation_key="remote1_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="13" operation="stop" operation_key="FAKE2_stop_0"/>
+        <pseudo_event id="14" operation="stop" operation_key="FAKE2_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="17" operation="stop" operation_key="FAKE3_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="20" operation="stop" operation_key="FAKE4_stop_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="22" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="23" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
+  <synapse id="14">
+    <action_set>
+      <crm_event id="5" operation="stonith" operation_key="stonith-remote1-reboot" on_node="remote1" on_node_uuid="remote1">
+        <attributes CRM_meta_on_node="remote1" CRM_meta_on_node_uuid="remote1" CRM_meta_probe_complete="true" CRM_meta_stonith_action="reboot" />
+        <downed>
+          <node id="remote1"/>
+        </downed>
+      </crm_event>
+    </action_set>
+    <inputs/>
+  </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-fence-unclean.scores b/pengine/test10/remote-fence-unclean.scores
index 038ca2e..8d29662 100644
--- a/pengine/test10/remote-fence-unclean.scores
+++ b/pengine/test10/remote-fence-unclean.scores
@@ -1,4 +1,3 @@
-  notice: Fencing   remote1: node is unclean
 Allocation scores:
 native_color: FAKE1 allocation score on 18builder: 0
 native_color: FAKE1 allocation score on 18node1: 0
diff --git a/pengine/test10/remote-fence-unclean.summary b/pengine/test10/remote-fence-unclean.summary
index 8f37909..9830b96 100644
--- a/pengine/test10/remote-fence-unclean.summary
+++ b/pengine/test10/remote-fence-unclean.summary
@@ -10,9 +10,8 @@ Online: [ 18builder 18node1 18node2 ]
  FAKE3	(ocf::heartbeat:Dummy):	Started 18builder 
  FAKE4	(ocf::heartbeat:Dummy):	Started 18node1 
 
-  notice: Fencing   remote1: node is unclean
 Transition Summary:
- * Fence (reboot) remote1
+ * Fence (reboot) remote1 'remote connection is unrecoverable'
  * Recover remote1	(Started 18node1)
  * Move    FAKE2	(Started remote1 -> 18builder)
  * Move    FAKE3	(Started 18builder -> 18node1)
@@ -22,18 +21,18 @@ Executing cluster transition:
  * Resource action: FAKE3           stop on 18builder
  * Resource action: FAKE4           stop on 18node1
  * Fencing remote1 (reboot)
- * Pseudo action:   stonith_complete
  * Pseudo action:   FAKE2_stop_0
- * Resource action: FAKE3           start on 18node1
- * Resource action: FAKE4           start on 18node2
+ * Pseudo action:   stonith_complete
  * Resource action: remote1         stop on 18node1
  * Resource action: FAKE2           start on 18builder
- * Resource action: FAKE3           monitor=60000 on 18node1
- * Resource action: FAKE4           monitor=60000 on 18node2
+ * Resource action: FAKE3           start on 18node1
+ * Resource action: FAKE4           start on 18node2
  * Pseudo action:   all_stopped
  * Resource action: remote1         start on 18node1
  * Resource action: remote1         monitor=60000 on 18node1
  * Resource action: FAKE2           monitor=60000 on 18builder
+ * Resource action: FAKE3           monitor=60000 on 18node1
+ * Resource action: FAKE4           monitor=60000 on 18node2
 
 Revised cluster status:
 Online: [ 18builder 18node1 18node2 ]
diff --git a/pengine/test10/remote-fence-unclean2.exp b/pengine/test10/remote-fence-unclean2.exp
index c28832b..c9c45ae 100644
--- a/pengine/test10/remote-fence-unclean2.exp
+++ b/pengine/test10/remote-fence-unclean2.exp
@@ -1,52 +1,52 @@
 <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="2" operation="stop" operation_key="fake_stop_0">
+      <pseudo_event id="3" operation="stop" operation_key="fake_stop_0">
         <attributes CRM_meta_name="stop" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="4" operation="stonith" operation_key="stonith-rh