commit fabf4840a335d199ec921b37692af02344e87565
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Fri Apr 4 10:14:05 2014 +1100

    Fix: PE: Fencing devices default to only requiring quorum in order to start
    
    (cherry picked from commit c19b872efb9ad1007f5bf574abf1928689af9dcc)
    
    Conflicts:
    	pengine/test10/bug-5186-partial-migrate.dot

diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
index 8b774c0..0f20481 100644
--- a/lib/pengine/complex.c
+++ b/lib/pengine/complex.c
@@ -586,7 +586,10 @@ common_unpack(xmlNode * xml_obj, resource_t ** rsc,
         }
 
         isdefault = TRUE;
-        if (is_set(data_set->flags, pe_flag_enable_unfencing)) {
+        if(is_set((*rsc)->flags, pe_rsc_fence_device)) {
+            value = "quorum";
+
+        } else if (is_set(data_set->flags, pe_flag_enable_unfencing)) {
             value = "unfencing";
 
         } else if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
diff --git a/pengine/test10/bug-5186-partial-migrate.exp b/pengine/test10/bug-5186-partial-migrate.exp
index 7e10e3a..216d962 100644
--- a/pengine/test10/bug-5186-partial-migrate.exp
+++ b/pengine/test10/bug-5186-partial-migrate.exp
@@ -167,9 +167,6 @@
       <trigger>
         <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0"/>
       </trigger>
-      <trigger>
-        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
@@ -220,9 +217,6 @@
       <trigger>
         <pseudo_event id="43" operation="start" operation_key="grpStonith8_start_0"/>
       </trigger>
-      <trigger>
-        <pseudo_event id="74" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
diff --git a/pengine/test10/bug-lf-2508.dot b/pengine/test10/bug-lf-2508.dot
index 6bef312..6e88af5 100644
--- a/pengine/test10/bug-lf-2508.dot
+++ b/pengine/test10/bug-lf-2508.dot
@@ -24,6 +24,7 @@ digraph "g" {
 "Group02_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "Group02_stopped_0" -> "Group02_start_0" [ style = bold]
 "Group02_stopped_0" [ style=bold color="green" fontcolor="orange" ]
+"all_stopped" -> "prmStonith3-3:1_start_0 srv01" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "clnStonith1_stop_0" -> "clnStonith1_stopped_0" [ style = bold]
 "clnStonith1_stop_0" -> "grpStonith1:1_stop_0" [ style = bold]
@@ -107,6 +108,5 @@ digraph "g" {
 "stonith_complete" -> "Dummy01_start_0 srv01" [ style = bold]
 "stonith_complete" -> "Dummy02_start_0 srv04" [ style = bold]
 "stonith_complete" -> "all_stopped" [ style = bold]
-"stonith_complete" -> "prmStonith3-3:1_start_0 srv01" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/bug-lf-2508.exp b/pengine/test10/bug-lf-2508.exp
index d56002e..0d84e9e 100644
--- a/pengine/test10/bug-lf-2508.exp
+++ b/pengine/test10/bug-lf-2508.exp
@@ -363,10 +363,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="115" operation="start" operation_key="grpStonith3:1_start_0"/>
+        <pseudo_event id="18" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="165" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="115" operation="start" operation_key="grpStonith3:1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/bug-lf-2551.dot b/pengine/test10/bug-lf-2551.dot
index 3225e00..ed80e15 100644
--- a/pengine/test10/bug-lf-2551.dot
+++ b/pengine/test10/bug-lf-2551.dot
@@ -80,7 +80,6 @@ digraph "g" {
 "stonith 'reboot' hex-9" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "dummy1_start_0 hex-0" [ style = bold]
-"stonith_complete" -> "fencing-sbd_start_0 hex-0" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 "vg1:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
 "vg1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp
index 7790199..1912812 100644
--- a/pengine/test10/bug-lf-2551.exp
+++ b/pengine/test10/bug-lf-2551.exp
@@ -10,9 +10,6 @@
       <trigger>
         <pseudo_event id="162" operation="stop" operation_key="fencing-sbd_stop_0"/>
       </trigger>
-      <trigger>
-        <pseudo_event id="248" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
diff --git a/pengine/test10/rec-node-11.dot b/pengine/test10/rec-node-11.dot
index 2865f41..bc76888 100644
--- a/pengine/test10/rec-node-11.dot
+++ b/pengine/test10/rec-node-11.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_start_0" -> "group1_running_0" [ style = bold]
@@ -56,6 +57,5 @@ digraph "g" {
 "stonith_complete" -> "rsc1_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc2_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc3_start_0 node2" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp
index f441ce8..b6f4c47 100644
--- a/pengine/test10/rec-node-11.exp
+++ b/pengine/test10/rec-node-11.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="18" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary
index d2ad78a..5a37fb8 100644
--- a/pengine/test10/rec-node-11.summary
+++ b/pengine/test10/rec-node-11.summary
@@ -22,13 +22,13 @@ Executing cluster transition:
  * Fencing node1 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on node2
  * Pseudo action:   group1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   group1_stopped_0
  * Resource action: rsc3            stop on node2
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on node2
  * Resource action: rsc3            start on node2
  * Pseudo action:   group1_start_0
  * Resource action: rsc1            start on node2
diff --git a/pengine/test10/rec-node-15.dot b/pengine/test10/rec-node-15.dot
index 31d0929..71062bf 100644
--- a/pengine/test10/rec-node-15.dot
+++ b/pengine/test10/rec-node-15.dot
@@ -42,6 +42,7 @@ digraph "g" {
 "LVM_22_start_0 sapcl01" -> "LVM_22_monitor_120000 sapcl01" [ style = bold]
 "LVM_22_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
+"all_stopped" -> "stonith-1_start_0 sapcl01" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "app02_running_0" [ style=bold color="green" fontcolor="orange" ]
 "app02_start_0" -> "Filesystem_13_start_0 sapcl01" [ style = bold]
@@ -98,6 +99,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "oracle_24_start_0 sapcl01" [ style = bold]
 "stonith_complete" -> "oralsnr_25_start_0 sapcl01" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 sapcl01" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-15.exp b/pengine/test10/rec-node-15.exp
index e1330a6..9654d34 100644
--- a/pengine/test10/rec-node-15.exp
+++ b/pengine/test10/rec-node-15.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="8" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="7" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="51" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="8" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary
index 85bfed5..b44a364 100644
--- a/pengine/test10/rec-node-15.summary
+++ b/pengine/test10/rec-node-15.summary
@@ -39,7 +39,6 @@ Executing cluster transition:
  * Fencing sapcl03 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on sapcl01
  * Resource action: Filesystem_13   stop on sapcl02
  * Resource action: IPaddr_192_168_1_104 start on sapcl01
  * Resource action: LVM_22          start on sapcl01
@@ -55,6 +54,7 @@ Executing cluster transition:
  * Resource action: oralsnr_25      monitor=120000 on sapcl01
  * Resource action: IPaddr_192_168_1_102 stop on sapcl02
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on sapcl01
  * Pseudo action:   app02_stopped_0
  * Pseudo action:   app02_start_0
  * Resource action: IPaddr_192_168_1_102 start on sapcl01
diff --git a/pengine/test10/rec-node-2.dot b/pengine/test10/rec-node-2.dot
index f8ba887..d889080 100644
--- a/pengine/test10/rec-node-2.dot
+++ b/pengine/test10/rec-node-2.dot
@@ -1,6 +1,7 @@
 digraph "g" {
 "all_stopped" -> "rsc1_start_0 node2" [ style = bold]
 "all_stopped" -> "rsc3_start_0 node2" [ style = bold]
+"all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_start_0" -> "group1_running_0" [ style = bold]
@@ -56,6 +57,5 @@ digraph "g" {
 "stonith_complete" -> "rsc4_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc5_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc6_start_0 node2" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-2.exp b/pengine/test10/rec-node-2.exp
index fd04c37..ea68e3e 100644
--- a/pengine/test10/rec-node-2.exp
+++ b/pengine/test10/rec-node-2.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="26" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-4.dot b/pengine/test10/rec-node-4.dot
index e5b31ef..221cefe 100644
--- a/pengine/test10/rec-node-4.dot
+++ b/pengine/test10/rec-node-4.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
@@ -30,6 +31,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "rsc1_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc2_start_0 node2" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp
index 2cbfecb..4932b98 100644
--- a/pengine/test10/rec-node-4.exp
+++ b/pengine/test10/rec-node-4.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary
index 295da1d..60f70fc 100644
--- a/pengine/test10/rec-node-4.summary
+++ b/pengine/test10/rec-node-4.summary
@@ -19,10 +19,10 @@ Executing cluster transition:
  * Fencing node1 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on node2
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
  * Resource action: rsc2            start on node2
 
diff --git a/pengine/test10/rec-node-6.dot b/pengine/test10/rec-node-6.dot
index e5b31ef..221cefe 100644
--- a/pengine/test10/rec-node-6.dot
+++ b/pengine/test10/rec-node-6.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
@@ -30,6 +31,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "rsc1_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc2_start_0 node2" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp
index 2cbfecb..4932b98 100644
--- a/pengine/test10/rec-node-6.exp
+++ b/pengine/test10/rec-node-6.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary
index 300d61b..7ae96e5 100644
--- a/pengine/test10/rec-node-6.summary
+++ b/pengine/test10/rec-node-6.summary
@@ -19,10 +19,10 @@ Executing cluster transition:
  * Fencing node1 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on node2
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
  * Resource action: rsc2            start on node2
 
diff --git a/pengine/test10/rec-node-7.dot b/pengine/test10/rec-node-7.dot
index e5b31ef..221cefe 100644
--- a/pengine/test10/rec-node-7.dot
+++ b/pengine/test10/rec-node-7.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
@@ -30,6 +31,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "rsc1_start_0 node2" [ style = bold]
 "stonith_complete" -> "rsc2_start_0 node2" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp
index 2cbfecb..4932b98 100644
--- a/pengine/test10/rec-node-7.exp
+++ b/pengine/test10/rec-node-7.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary
index 295da1d..60f70fc 100644
--- a/pengine/test10/rec-node-7.summary
+++ b/pengine/test10/rec-node-7.summary
@@ -19,10 +19,10 @@ Executing cluster transition:
  * Fencing node1 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on node2
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on node2
  * Resource action: rsc1            start on node2
  * Resource action: rsc2            start on node2
 
diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot
index 53b9521..3ca51f8 100644
--- a/pengine/test10/rec-rsc-5.dot
+++ b/pengine/test10/rec-rsc-5.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 node1" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
@@ -30,6 +31,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "rsc1_start_0 node1" [ style = bold]
 "stonith_complete" -> "rsc2_start_0 node1" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 node1" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
index 95a3558..a99555f 100644
--- a/pengine/test10/rec-rsc-5.exp
+++ b/pengine/test10/rec-rsc-5.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary
index 549abe6..cdb9011 100644
--- a/pengine/test10/rec-rsc-5.summary
+++ b/pengine/test10/rec-rsc-5.summary
@@ -19,10 +19,10 @@ Executing cluster transition:
  * Fencing node2 (reboot)
  * Pseudo action:   stonith_complete
  * Pseudo action:   probe_complete
- * Resource action: stonith-1       start on node1
  * Pseudo action:   rsc1_stop_0
  * Pseudo action:   rsc2_stop_0
  * Pseudo action:   all_stopped
+ * Resource action: stonith-1       start on node1
  * Resource action: rsc1            start on node1
  * Resource action: rsc2            start on node1
 
diff --git a/pengine/test10/stonith-3.dot b/pengine/test10/stonith-3.dot
index df5f607..86c3bd3 100644
--- a/pengine/test10/stonith-3.dot
+++ b/pengine/test10/stonith-3.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "prmStonith:0_start_0 rh5node2" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "clnStonith_running_0" [ style=bold color="green" fontcolor="orange" ]
 "clnStonith_start_0" -> "clnStonith_running_0" [ style = bold]
@@ -27,6 +28,5 @@ digraph "g" {
 "stonith 'reboot' rh5node1" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold]
-"stonith_complete" -> "prmStonith:0_start_0 rh5node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/stonith-3.exp b/pengine/test10/stonith-3.exp
index c4c1e32..4ada6ad 100644
--- a/pengine/test10/stonith-3.exp
+++ b/pengine/test10/stonith-3.exp
@@ -73,13 +73,13 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="9" operation="start" operation_key="grpStonith:0_start_0"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="21" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="9" operation="start" operation_key="grpStonith:0_start_0"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/stonith-4.dot b/pengine/test10/stonith-4.dot
index 24243d8..1a7771a 100644
--- a/pengine/test10/stonith-4.dot
+++ b/pengine/test10/stonith-4.dot
@@ -6,6 +6,7 @@ digraph "g" {
 "Fencing_monitor_0 pcmk-3" -> "probe_complete pcmk-3" [ style = dashed]
 "Fencing_monitor_0 pcmk-3" [ style=dashed color="red" fontcolor="black"]
 "Fencing_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
+"all_stopped" -> "Fencing_start_0 pcmk-1" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "probe_complete pcmk-11" -> "probe_complete" [ style = bold]
 "probe_complete pcmk-11" [ style=dashed color="red" fontcolor="black"]
@@ -23,7 +24,6 @@ digraph "g" {
 "stonith 'reboot' pcmk-7" [ style=bold color="green" fontcolor="black"]
 "stonith 'reboot' pcmk-8" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' pcmk-8" [ style=bold color="green" fontcolor="black"]
-"stonith_complete" -> "Fencing_start_0 pcmk-1" [ style = bold]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/stonith-4.exp b/pengine/test10/stonith-4.exp
index 2be0a96..aa61f4d 100644
--- a/pengine/test10/stonith-4.exp
+++ b/pengine/test10/stonith-4.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealth2.dot b/pengine/test10/systemhealth2.dot
index dcf49eb..1e029a6 100644
--- a/pengine/test10/systemhealth2.dot
+++ b/pengine/test10/systemhealth2.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
 "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
@@ -24,6 +25,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold]
 "stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 hs21c" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/systemhealth2.exp b/pengine/test10/systemhealth2.exp
index 95d8847..43ae4e3 100644
--- a/pengine/test10/systemhealth2.exp
+++ b/pengine/test10/systemhealth2.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealth3.dot b/pengine/test10/systemhealth3.dot
index dcf49eb..1e029a6 100644
--- a/pengine/test10/systemhealth3.dot
+++ b/pengine/test10/systemhealth3.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
 "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
@@ -24,6 +25,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold]
 "stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 hs21c" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/systemhealth3.exp b/pengine/test10/systemhealth3.exp
index 95d8847..43ae4e3 100644
--- a/pengine/test10/systemhealth3.exp
+++ b/pengine/test10/systemhealth3.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthm2.dot b/pengine/test10/systemhealthm2.dot
index dcf49eb..1e029a6 100644
--- a/pengine/test10/systemhealthm2.dot
+++ b/pengine/test10/systemhealthm2.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
 "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
@@ -24,6 +25,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold]
 "stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 hs21c" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/systemhealthm2.exp b/pengine/test10/systemhealthm2.exp
index 95d8847..43ae4e3 100644
--- a/pengine/test10/systemhealthm2.exp
+++ b/pengine/test10/systemhealthm2.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthn2.dot b/pengine/test10/systemhealthn2.dot
index dcf49eb..1e029a6 100644
--- a/pengine/test10/systemhealthn2.dot
+++ b/pengine/test10/systemhealthn2.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
 "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
@@ -24,6 +25,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold]
 "stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 hs21c" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/systemhealthn2.exp b/pengine/test10/systemhealthn2.exp
index 95d8847..43ae4e3 100644
--- a/pengine/test10/systemhealthn2.exp
+++ b/pengine/test10/systemhealthn2.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/systemhealthn3.dot b/pengine/test10/systemhealthn3.dot
index dcf49eb..1e029a6 100644
--- a/pengine/test10/systemhealthn3.dot
+++ b/pengine/test10/systemhealthn3.dot
@@ -1,4 +1,5 @@
 digraph "g" {
+"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "apache_1_monitor_0 hs21c" -> "probe_complete hs21c" [ style = bold]
 "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ]
@@ -24,6 +25,5 @@ digraph "g" {
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold]
 "stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold]
-"stonith_complete" -> "stonith-1_start_0 hs21c" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/systemhealthn3.exp b/pengine/test10/systemhealthn3.exp
index 95d8847..43ae4e3 100644
--- a/pengine/test10/systemhealthn3.exp
+++ b/pengine/test10/systemhealthn3.exp
@@ -8,10 +8,10 @@
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/ticket-master-21.dot b/pengine/test10/ticket-master-21.dot
index e1abd95..60386a8 100644
--- a/pengine/test10/ticket-master-21.dot
+++ b/pengine/test10/ticket-master-21.dot
@@ -27,6 +27,5 @@ digraph "g" {
 "stonith 'reboot' node1" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
-"stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/ticket-master-21.exp b/pengine/test10/ticket-master-21.exp
index 5b21e47..e9482c4 100644
--- a/pengine/test10/ticket-master-21.exp
+++ b/pengine/test10/ticket-master-21.exp
@@ -10,9 +10,6 @@
       <trigger>
         <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
       </trigger>
-      <trigger>
-        <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
diff --git a/pengine/test10/ticket-master-9.dot b/pengine/test10/ticket-master-9.dot
index 40c2e7f..3a29836 100644
--- a/pengine/test10/ticket-master-9.dot
+++ b/pengine/test10/ticket-master-9.dot
@@ -27,6 +27,5 @@ digraph "g" {
 "stonith 'reboot' node1" -> "stonith_complete" [ style = bold]
 "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
-"stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/ticket-master-9.exp b/pengine/test10/ticket-master-9.exp
index 5b21e47..e9482c4 100644
--- a/pengine/test10/ticket-master-9.exp
+++ b/pengine/test10/ticket-master-9.exp
@@ -10,9 +10,6 @@
       <trigger>
         <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
       </trigger>
-      <trigger>
-        <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
-      </trigger>
     </inputs>
   </synapse>
   <synapse id="1">