diff --git a/pengine/test10/remote-disable.dot b/pengine/test10/remote-disable.dot
index 2e21fefdc2..fbcea60ec6 100644
--- a/pengine/test10/remote-disable.dot
+++ b/pengine/test10/remote-disable.dot
@@ -1,12 +1,8 @@
digraph "g" {
-"FAKE2_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKE2_start_0 18builder" -> "FAKE2_monitor_60000 18builder" [ style = bold]
-"FAKE2_start_0 18builder" [ style=bold color="green" fontcolor="black"]
-"FAKE2_stop_0 remote1" -> "FAKE2_start_0 18builder" [ style = bold]
"FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold]
"FAKE2_stop_0 remote1" -> "remote1_stop_0 18builder" [ style = bold]
"FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"remote1_stop_0 18builder" -> "all_stopped" [ style = bold]
"remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/remote-disable.exp b/pengine/test10/remote-disable.exp
index 3273bb2820..99c1c556f3 100644
--- a/pengine/test10/remote-disable.exp
+++ b/pengine/test10/remote-disable.exp
@@ -1,65 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/pengine/test10/remote-disable.scores b/pengine/test10/remote-disable.scores
index 4efd7d8dfa..d66861f5e4 100644
--- a/pengine/test10/remote-disable.scores
+++ b/pengine/test10/remote-disable.scores
@@ -1,25 +1,25 @@
Allocation scores:
native_color: FAKE1 allocation score on 18builder: 0
native_color: FAKE1 allocation score on 18node1: 0
native_color: FAKE1 allocation score on 18node2: 0
native_color: FAKE1 allocation score on remote1: 0
-native_color: FAKE2 allocation score on 18builder: 0
-native_color: FAKE2 allocation score on 18node1: 0
-native_color: FAKE2 allocation score on 18node2: 0
+native_color: FAKE2 allocation score on 18builder: -INFINITY
+native_color: FAKE2 allocation score on 18node1: -INFINITY
+native_color: FAKE2 allocation score on 18node2: -INFINITY
native_color: FAKE2 allocation score on remote1: 0
native_color: FAKE3 allocation score on 18builder: 0
native_color: FAKE3 allocation score on 18node1: 0
native_color: FAKE3 allocation score on 18node2: 0
native_color: FAKE3 allocation score on remote1: 0
native_color: FAKE4 allocation score on 18builder: 0
native_color: FAKE4 allocation score on 18node1: 0
native_color: FAKE4 allocation score on 18node2: 0
native_color: FAKE4 allocation score on remote1: 0
native_color: remote1 allocation score on 18builder: -INFINITY
native_color: remote1 allocation score on 18node1: -INFINITY
native_color: remote1 allocation score on 18node2: -INFINITY
native_color: remote1 allocation score on remote1: -INFINITY
native_color: shooter allocation score on 18builder: 0
native_color: shooter allocation score on 18node1: 0
native_color: shooter allocation score on 18node2: 0
native_color: shooter allocation score on remote1: -INFINITY
diff --git a/pengine/test10/remote-disable.summary b/pengine/test10/remote-disable.summary
index 57b06fe532..0627647743 100644
--- a/pengine/test10/remote-disable.summary
+++ b/pengine/test10/remote-disable.summary
@@ -1,34 +1,32 @@
Current cluster status:
Online: [ 18builder 18node1 18node2 ]
RemoteOnline: [ remote1 ]
shooter (stonith:fence_xvm): Started 18node1
remote1 (ocf::pacemaker:remote): Started 18builder
FAKE1 (ocf::heartbeat:Dummy): Started 18node2
FAKE2 (ocf::heartbeat:Dummy): Started remote1
FAKE3 (ocf::heartbeat:Dummy): Started 18builder
FAKE4 (ocf::heartbeat:Dummy): Started 18node1
Transition Summary:
* Stop remote1 (18builder)
- * Move FAKE2 (Started remote1 -> 18builder)
+ * Stop FAKE2 (remote1)
Executing cluster transition:
* Resource action: FAKE2 stop on remote1
* Resource action: remote1 stop on 18builder
- * Resource action: FAKE2 start on 18builder
* Pseudo action: all_stopped
- * Resource action: FAKE2 monitor=60000 on 18builder
Revised cluster status:
Online: [ 18builder 18node1 18node2 ]
RemoteOFFLINE: [ remote1 ]
shooter (stonith:fence_xvm): Started 18node1
remote1 (ocf::pacemaker:remote): Stopped
FAKE1 (ocf::heartbeat:Dummy): Started 18node2
- FAKE2 (ocf::heartbeat:Dummy): Started 18builder
+ FAKE2 (ocf::heartbeat:Dummy): Stopped
FAKE3 (ocf::heartbeat:Dummy): Started 18builder
FAKE4 (ocf::heartbeat:Dummy): Started 18node1
diff --git a/pengine/test10/remote-disable.xml b/pengine/test10/remote-disable.xml
index eae0055f3c..1637801423 100644
--- a/pengine/test10/remote-disable.xml
+++ b/pengine/test10/remote-disable.xml
@@ -1,180 +1,186 @@
-
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-start.dot b/pengine/test10/whitebox-start.dot
index bec57b0845..659ea97f19 100644
--- a/pengine/test10/whitebox-start.dot
+++ b/pengine/test10/whitebox-start.dot
@@ -1,17 +1,32 @@
digraph "g" {
+"A_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
+"A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold]
+"A_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"A_stop_0 18node1" -> "A_start_0 lxc1" [ style = bold]
+"A_stop_0 18node1" -> "all_stopped" [ style = bold]
+"A_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
+"B_monitor_10000 18node3" [ style=bold color="green" fontcolor="black"]
+"B_start_0 18node3" -> "B_monitor_10000 18node3" [ style = bold]
+"B_start_0 18node3" [ style=bold color="green" fontcolor="black"]
+"B_stop_0 lxc2" -> "B_start_0 18node3" [ style = bold]
+"B_stop_0 lxc2" -> "all_stopped" [ style = bold]
+"B_stop_0 lxc2" [ style=bold color="green" fontcolor="black"]
"M-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_start_0" -> "M-clone_running_0" [ style = bold]
"M-clone_start_0" -> "M_start_0 lxc1" [ style = bold]
"M-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"M_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"M_start_0 lxc1" -> "M-clone_running_0" [ style = bold]
"M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold]
"M_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
"container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"]
+"lxc1_start_0 18node1" -> "A_monitor_10000 lxc1" [ style = bold]
+"lxc1_start_0 18node1" -> "A_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node1" -> "M_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node1" -> "M_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node1" -> "lxc1_monitor_30000 18node1" [ style = bold]
"lxc1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/whitebox-start.exp b/pengine/test10/whitebox-start.exp
index 0ee104c102..68ede8ea20 100644
--- a/pengine/test10/whitebox-start.exp
+++ b/pengine/test10/whitebox-start.exp
@@ -1,93 +1,183 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/pengine/test10/whitebox-start.scores b/pengine/test10/whitebox-start.scores
index 1a00b280d5..1f0f273b6c 100644
--- a/pengine/test10/whitebox-start.scores
+++ b/pengine/test10/whitebox-start.scores
@@ -1,101 +1,101 @@
Allocation scores:
clone_color: M-clone allocation score on 18node1: 0
clone_color: M-clone allocation score on 18node2: 0
clone_color: M-clone allocation score on 18node3: 0
clone_color: M-clone allocation score on lxc1: 0
clone_color: M-clone allocation score on lxc2: 0
clone_color: M:0 allocation score on 18node1: 100
clone_color: M:0 allocation score on 18node2: 0
clone_color: M:0 allocation score on 18node3: 0
clone_color: M:0 allocation score on lxc1: 0
clone_color: M:0 allocation score on lxc2: 0
clone_color: M:1 allocation score on 18node1: 0
clone_color: M:1 allocation score on 18node2: 100
clone_color: M:1 allocation score on 18node3: 0
clone_color: M:1 allocation score on lxc1: 0
clone_color: M:1 allocation score on lxc2: 0
clone_color: M:2 allocation score on 18node1: 0
clone_color: M:2 allocation score on 18node2: 0
clone_color: M:2 allocation score on 18node3: 100
clone_color: M:2 allocation score on lxc1: 0
clone_color: M:2 allocation score on lxc2: 0
clone_color: M:3 allocation score on 18node1: 0
clone_color: M:3 allocation score on 18node2: 0
clone_color: M:3 allocation score on 18node3: 0
clone_color: M:3 allocation score on lxc1: 0
clone_color: M:3 allocation score on lxc2: 100
clone_color: M:4 allocation score on 18node1: 0
clone_color: M:4 allocation score on 18node2: 0
clone_color: M:4 allocation score on 18node3: 0
clone_color: M:4 allocation score on lxc1: 0
clone_color: M:4 allocation score on lxc2: 0
native_color: A allocation score on 18node1: 100
native_color: A allocation score on 18node2: 0
native_color: A allocation score on 18node3: 0
-native_color: A allocation score on lxc1: 0
-native_color: A allocation score on lxc2: 0
-native_color: B allocation score on 18node1: 0
-native_color: B allocation score on 18node2: 0
-native_color: B allocation score on 18node3: 0
+native_color: A allocation score on lxc1: INFINITY
+native_color: A allocation score on lxc2: INFINITY
+native_color: B allocation score on 18node1: INFINITY
+native_color: B allocation score on 18node2: INFINITY
+native_color: B allocation score on 18node3: INFINITY
native_color: B allocation score on lxc1: 0
native_color: B allocation score on lxc2: 100
native_color: C allocation score on 18node1: 0
native_color: C allocation score on 18node2: 0
native_color: C allocation score on 18node3: 0
native_color: C allocation score on lxc1: 0
native_color: C allocation score on lxc2: 100
native_color: D allocation score on 18node1: 100
native_color: D allocation score on 18node2: 0
native_color: D allocation score on 18node3: 0
native_color: D allocation score on lxc1: 0
native_color: D allocation score on lxc2: 0
native_color: M:0 allocation score on 18node1: 100
native_color: M:0 allocation score on 18node2: 0
native_color: M:0 allocation score on 18node3: -INFINITY
native_color: M:0 allocation score on lxc1: 0
native_color: M:0 allocation score on lxc2: -INFINITY
native_color: M:1 allocation score on 18node1: -INFINITY
native_color: M:1 allocation score on 18node2: 100
native_color: M:1 allocation score on 18node3: -INFINITY
native_color: M:1 allocation score on lxc1: 0
native_color: M:1 allocation score on lxc2: -INFINITY
native_color: M:2 allocation score on 18node1: 0
native_color: M:2 allocation score on 18node2: 0
native_color: M:2 allocation score on 18node3: 100
native_color: M:2 allocation score on lxc1: 0
native_color: M:2 allocation score on lxc2: -INFINITY
native_color: M:3 allocation score on 18node1: 0
native_color: M:3 allocation score on 18node2: 0
native_color: M:3 allocation score on 18node3: 0
native_color: M:3 allocation score on lxc1: 0
native_color: M:3 allocation score on lxc2: 100
native_color: M:4 allocation score on 18node1: -INFINITY
native_color: M:4 allocation score on 18node2: -INFINITY
native_color: M:4 allocation score on 18node3: -INFINITY
native_color: M:4 allocation score on lxc1: 0
native_color: M:4 allocation score on lxc2: -INFINITY
native_color: container1 allocation score on 18node1: 0
native_color: container1 allocation score on 18node2: 0
native_color: container1 allocation score on 18node3: 0
native_color: container1 allocation score on lxc1: -INFINITY
native_color: container1 allocation score on lxc2: -INFINITY
native_color: container2 allocation score on 18node1: 0
native_color: container2 allocation score on 18node2: 200
native_color: container2 allocation score on 18node3: 0
native_color: container2 allocation score on lxc1: -INFINITY
native_color: container2 allocation score on lxc2: -INFINITY
native_color: lxc1 allocation score on 18node1: 0
native_color: lxc1 allocation score on 18node2: -INFINITY
native_color: lxc1 allocation score on 18node3: -INFINITY
native_color: lxc1 allocation score on lxc1: -INFINITY
native_color: lxc1 allocation score on lxc2: -INFINITY
native_color: lxc2 allocation score on 18node1: -INFINITY
native_color: lxc2 allocation score on 18node2: 100
native_color: lxc2 allocation score on 18node3: -INFINITY
native_color: lxc2 allocation score on lxc1: -INFINITY
native_color: lxc2 allocation score on lxc2: -INFINITY
native_color: shoot1 allocation score on 18node1: 0
native_color: shoot1 allocation score on 18node2: 0
native_color: shoot1 allocation score on 18node3: 100
native_color: shoot1 allocation score on lxc1: -INFINITY
native_color: shoot1 allocation score on lxc2: -INFINITY
diff --git a/pengine/test10/whitebox-start.summary b/pengine/test10/whitebox-start.summary
index 2801abe21f..6819ebc6f9 100644
--- a/pengine/test10/whitebox-start.summary
+++ b/pengine/test10/whitebox-start.summary
@@ -1,44 +1,53 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Stopped
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc2 ]
Stopped: [ lxc1 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): Started lxc2
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
Transition Summary:
* Start container1 (18node1)
* Start M:4 (lxc1)
+ * Move A (Started 18node1 -> lxc1)
+ * Move B (Started lxc2 -> 18node3)
* Start lxc1 (18node1)
Executing cluster transition:
* Resource action: container1 start on 18node1
* Pseudo action: M-clone_start_0
+ * Resource action: A stop on 18node1
+ * Resource action: B stop on lxc2
* Resource action: lxc1 start on 18node1
+ * Pseudo action: all_stopped
* Resource action: M start on lxc1
* Pseudo action: M-clone_running_0
+ * Resource action: A start on lxc1
+ * Resource action: B start on 18node3
* Resource action: lxc1 monitor=30000 on 18node1
* Resource action: M monitor=10000 on lxc1
+ * Resource action: A monitor=10000 on lxc1
+ * Resource action: B monitor=10000 on 18node3
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Started 18node1
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc1 lxc2 ]
- A (ocf::pacemaker:Dummy): Started 18node1
- B (ocf::pacemaker:Dummy): Started lxc2
+ A (ocf::pacemaker:Dummy): Started lxc1
+ B (ocf::pacemaker:Dummy): Started 18node3
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
diff --git a/pengine/test10/whitebox-start.xml b/pengine/test10/whitebox-start.xml
index 2dad074ff5..67fcbaffb7 100644
--- a/pengine/test10/whitebox-start.xml
+++ b/pengine/test10/whitebox-start.xml
@@ -1,259 +1,270 @@
-
+
+
+
+
+
+
+
+
+
+
+
+