diff --git a/pengine/test10/797.dot b/pengine/test10/797.dot
index 85cfb9e5f1..6d56b26972 100644
--- a/pengine/test10/797.dot
+++ b/pengine/test10/797.dot
@@ -1,112 +1,110 @@
digraph "g" {
"DcIPaddr_delete_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
-"DcIPaddr_delete_0 c001n03" -> "lrm_refresh c001n03" [ style = bold]
"DcIPaddr_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black"]
"DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = dashed]
"DcIPaddr_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ]
"DcIPaddr_stop_0 c001n03" -> "DcIPaddr_delete_0 c001n03" [ style = bold]
"DcIPaddr_stop_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
"DcIPaddr_stop_0 c001n03" -> "all_stopped" [ style = bold]
"DcIPaddr_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ]
"DoFencing_start_0" -> "DoFencing_running_0" [ style = bold]
"DoFencing_start_0" -> "child_DoFencing:0_start_0 c001n01" [ style = bold]
"DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ]
"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n03" [ style = bold]
"DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold]
"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"child_DoFencing:0_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:0_start_0 c001n01" -> "DoFencing_running_0" [ style = bold]
"child_DoFencing:0_start_0 c001n01" -> "child_DoFencing:0_monitor_5000 c001n01" [ style = bold]
"child_DoFencing:0_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "all_stopped" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "child_DoFencing:0_start_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:0_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = bold]
"child_DoFencing:0_stop_0 c001n03" -> "all_stopped" [ style = bold]
"child_DoFencing:0_stop_0 c001n03" -> "child_DoFencing:0_start_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
"child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = bold]
"child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
"child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:2_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:3_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
-"lrm_refresh c001n03" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n01" -> "probe_complete" [ style = bold]
"probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n02" -> "probe_complete" [ style = bold]
"probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n03" -> "probe_complete" [ style = bold]
"probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
"probe_complete" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
"probe_complete" -> "DcIPaddr_stop_0 c001n03" [ style = bold]
"probe_complete" -> "child_DoFencing:0_start_0 c001n01" [ style = bold]
"probe_complete" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"probe_complete" -> "child_DoFencing:0_stop_0 c001n03" [ style = bold]
"probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
"probe_complete" -> "rsc_c001n01_stop_0 c001n01" [ style = bold]
"probe_complete" -> "rsc_c001n02_start_0 c001n01" [ style = dashed]
"probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"probe_complete" -> "rsc_c001n03_stop_0 c001n03" [ style = bold]
"probe_complete" -> "rsc_c001n08_start_0 c001n01" [ style = dashed]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black"]
"rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
"rsc_c001n01_start_0 c001n01" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
"rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = dashed]
"rsc_c001n02_start_0 c001n01" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold]
"rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = dashed]
"rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black"]
"rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
"rsc_c001n03_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n03_stop_0 c001n03" -> "all_stopped" [ style = bold]
"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
"rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n08_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = dashed]
"rsc_c001n08_start_0 c001n01" [ style=dashed color="red" fontcolor="black" ]
"rsc_c001n08_stop_0 c001n02" -> "all_stopped" [ style = bold]
"rsc_c001n08_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
"rsc_c001n08_stop_0 c001n02" -> "rsc_c001n08_start_0 c001n01" [ style = dashed]
"rsc_c001n08_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp
index 7dcfb1ba5c..cac962db57 100644
--- a/pengine/test10/797.exp
+++ b/pengine/test10/797.exp
@@ -1,473 +1,461 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/797.summary b/pengine/test10/797.summary
index 1857998c34..ef69c6d8a0 100644
--- a/pengine/test10/797.summary
+++ b/pengine/test10/797.summary
@@ -1,74 +1,73 @@
Current cluster status:
Node c001n08 (6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b): UNCLEAN (offline)
Online: [ c001n01 c001n02 c001n03 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n08 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01
Clone Set: DoFencing [child_DoFencing] (unique)
child_DoFencing:0 (stonith:ssh): Started [ c001n01 c001n03 ]
child_DoFencing:1 (stonith:ssh): Started c001n02
child_DoFencing:2 (stonith:ssh): Started c001n03
child_DoFencing:3 (stonith:ssh): Stopped
Transition Summary:
* Stop DcIPaddr (Started c001n03)
* Stop rsc_c001n08 (Started c001n01)
* Stop rsc_c001n02 (Started c001n01)
* Stop rsc_c001n03 (Started c001n03)
* Stop rsc_c001n01 (Started c001n01)
* Restart child_DoFencing:0 (Started c001n01)
* Stop child_DoFencing:1 (c001n02)
Executing cluster transition:
* Resource action: DcIPaddr monitor on c001n02
* Resource action: DcIPaddr monitor on c001n01
* Resource action: rsc_c001n08 stop on c001n02
* Resource action: rsc_c001n08 monitor on c001n03
* Resource action: rsc_c001n08 monitor on c001n01
* Resource action: rsc_c001n02 stop on c001n02
* Resource action: rsc_c001n02 monitor on c001n03
* Resource action: rsc_c001n02 monitor on c001n01
* Resource action: rsc_c001n03 monitor on c001n02
* Resource action: rsc_c001n03 monitor on c001n01
* Resource action: rsc_c001n01 monitor on c001n03
* Resource action: child_DoFencing:2 monitor on c001n01
* Resource action: child_DoFencing:3 monitor on c001n03
* Resource action: child_DoFencing:3 monitor on c001n02
* Resource action: child_DoFencing:3 monitor on c001n01
* Pseudo action: DoFencing_stop_0
* Pseudo action: probe_complete
* Resource action: DcIPaddr stop on c001n03
* Resource action: rsc_c001n03 stop on c001n03
* Resource action: rsc_c001n01 stop on c001n01
* Resource action: child_DoFencing:0 stop on c001n03
* Resource action: child_DoFencing:0 stop on c001n01
* Resource action: child_DoFencing:1 stop on c001n02
* Pseudo action: DoFencing_stopped_0
* Pseudo action: DoFencing_start_0
* Cluster action: do_shutdown on c001n02
* Pseudo action: all_stopped
* Resource action: DcIPaddr delete on c001n03
* Resource action: child_DoFencing:0 start on c001n01
* Resource action: child_DoFencing:0 monitor=5000 on c001n01
* Pseudo action: DoFencing_running_0
- * Cluster action: lrm_refresh on c001n03
Revised cluster status:
Node c001n08 (6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b): UNCLEAN (offline)
Online: [ c001n01 c001n02 c001n03 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n08 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n02 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n03 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n01 (ocf::heartbeat:IPaddr): Stopped
Clone Set: DoFencing [child_DoFencing] (unique)
child_DoFencing:0 (stonith:ssh): Started c001n01
child_DoFencing:1 (stonith:ssh): Stopped
child_DoFencing:2 (stonith:ssh): Started c001n03
child_DoFencing:3 (stonith:ssh): Stopped
diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot
index 5778c67d9f..82aa24fd41 100644
--- a/pengine/test10/params-2.dot
+++ b/pengine/test10/params-2.dot
@@ -1,39 +1,37 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"do_shutdown node1" [ style=bold color="green" fontcolor="black" ]
-"lrm_refresh node2" [ style=bold color="green" fontcolor="black" ]
"probe_complete node1" -> "probe_complete" [ style = bold]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"probe_complete node2" -> "probe_complete" [ style = bold]
"probe_complete node2" [ style=bold color="green" fontcolor="black" ]
"probe_complete node3" -> "probe_complete" [ style = bold]
"probe_complete node3" [ style=bold color="green" fontcolor="black" ]
"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
"probe_complete" -> "rsc2_stop_0 node2" [ style = bold]
"probe_complete" -> "rsc3_start_0 node3" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
"rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
"rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
"rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold]
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc2_delete_0 node2" -> "lrm_refresh node2" [ style = bold]
"rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_delete_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc2_monitor_0 node3" -> "probe_complete node3" [ style = bold]
"rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_stop_0 node2" -> "all_stopped" [ style = bold]
"rsc2_stop_0 node2" -> "rsc2_delete_0 node2" [ style = bold]
"rsc2_stop_0 node2" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp
index 29488f7450..bd60b62950 100644
--- a/pengine/test10/params-2.exp
+++ b/pengine/test10/params-2.exp
@@ -1,226 +1,214 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary
index a9ecfc2b36..2e8cf67052 100644
--- a/pengine/test10/params-2.summary
+++ b/pengine/test10/params-2.summary
@@ -1,37 +1,36 @@
Current cluster status:
Online: [ node1 node2 node3 ]
rsc1 (lsb:apache): Started node1
rsc2 (lsb:apache): Started node2
rsc3 (lsb:apache): Stopped
Transition Summary:
* Stop rsc1 (node1)
* Restart rsc2 (Started node2)
* Start rsc3 (node3)
Executing cluster transition:
* Resource action: rsc1 stop on node1
* Resource action: rsc1 monitor on node3
* Resource action: rsc1 monitor on node2
* Resource action: rsc2 monitor on node3
* Resource action: rsc2 monitor on node1
* Resource action: rsc3 monitor on node2
* Resource action: rsc3 monitor on node1
* Cluster action: do_shutdown on node1
* Pseudo action: probe_complete
* Resource action: rsc2 stop on node2
* Resource action: rsc3 start on node3
* Pseudo action: all_stopped
* Resource action: rsc2 delete on node2
- * Cluster action: lrm_refresh on node2
* Resource action: rsc2 start on node2
Revised cluster status:
Online: [ node1 node2 node3 ]
rsc1 (lsb:apache): Stopped
rsc2 (lsb:apache): Started node2
rsc3 (lsb:apache): Started node3