diff --git a/cts/scheduler/dot/clbz5007-promotable-colocation.dot b/cts/scheduler/dot/clbz5007-promotable-colocation.dot index 84900bd357..862797d39f 100644 --- a/cts/scheduler/dot/clbz5007-promotable-colocation.dot +++ b/cts/scheduler/dot/clbz5007-promotable-colocation.dot @@ -1,8 +1,8 @@ digraph "g" { -"MASTER_IP_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"MASTER_IP_stop_0 fc16-builder2" -> "MASTER_IP_start_0 fc16-builder" [ style = bold] -"MASTER_IP_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] -"SLAVE_IP_start_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] -"SLAVE_IP_stop_0 fc16-builder" -> "SLAVE_IP_start_0 fc16-builder2" [ style = bold] -"SLAVE_IP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] +"PROMOTED_IP_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"] +"PROMOTED_IP_stop_0 fc16-builder2" -> "PROMOTED_IP_start_0 fc16-builder" [ style = bold] +"PROMOTED_IP_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] +"UNPROMOTED_IP_start_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] +"UNPROMOTED_IP_stop_0 fc16-builder" -> "UNPROMOTED_IP_start_0 fc16-builder2" [ style = bold] +"UNPROMOTED_IP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] } diff --git a/cts/scheduler/exp/clbz5007-promotable-colocation.exp b/cts/scheduler/exp/clbz5007-promotable-colocation.exp index e2b20fa2a0..8ce6372476 100644 --- a/cts/scheduler/exp/clbz5007-promotable-colocation.exp +++ b/cts/scheduler/exp/clbz5007-promotable-colocation.exp @@ -1,46 +1,46 @@ - - + + - + - - + + - - + + - + - - + + diff --git a/cts/scheduler/scores/clbz5007-promotable-colocation.scores b/cts/scheduler/scores/clbz5007-promotable-colocation.scores index 435e89414e..cbaab5c844 100644 --- a/cts/scheduler/scores/clbz5007-promotable-colocation.scores +++ b/cts/scheduler/scores/clbz5007-promotable-colocation.scores @@ -1,17 +1,17 @@ DUMMY:0 promotion score on fc16-builder: 10 DUMMY:1 promotion score on fc16-builder2: 5 pcmk__clone_allocate: DUMMY:0 allocation score on fc16-builder2: 0 pcmk__clone_allocate: DUMMY:0 allocation score on fc16-builder: 11 pcmk__clone_allocate: DUMMY:1 allocation score on fc16-builder2: 6 pcmk__clone_allocate: DUMMY:1 allocation score on fc16-builder: 0 pcmk__clone_allocate: MS_DUMMY allocation score on fc16-builder2: 0 pcmk__clone_allocate: MS_DUMMY allocation score on fc16-builder: 0 pcmk__primitive_assign: DUMMY:0 allocation score on fc16-builder2: 0 pcmk__primitive_assign: DUMMY:0 allocation score on fc16-builder: 11 pcmk__primitive_assign: DUMMY:1 allocation score on fc16-builder2: 6 pcmk__primitive_assign: DUMMY:1 allocation score on fc16-builder: -INFINITY -pcmk__primitive_assign: MASTER_IP allocation score on fc16-builder2: -INFINITY -pcmk__primitive_assign: MASTER_IP allocation score on fc16-builder: 11 -pcmk__primitive_assign: SLAVE_IP allocation score on fc16-builder2: 1000 -pcmk__primitive_assign: SLAVE_IP allocation score on fc16-builder: 101 +pcmk__primitive_assign: PROMOTED_IP allocation score on fc16-builder2: -INFINITY +pcmk__primitive_assign: PROMOTED_IP allocation score on fc16-builder: 11 +pcmk__primitive_assign: UNPROMOTED_IP allocation score on fc16-builder2: 1000 +pcmk__primitive_assign: UNPROMOTED_IP allocation score on fc16-builder: 101 diff --git a/cts/scheduler/summary/clbz5007-promotable-colocation.summary b/cts/scheduler/summary/clbz5007-promotable-colocation.summary index 463fc10dde..98b2d75ca5 100644 --- a/cts/scheduler/summary/clbz5007-promotable-colocation.summary +++ b/cts/scheduler/summary/clbz5007-promotable-colocation.summary @@ -1,31 +1,31 @@ Current cluster status: * Node List: * Online: [ fc16-builder fc16-builder2 ] * Full List of Resources: * Clone Set: MS_DUMMY [DUMMY] (promotable): * Promoted: [ fc16-builder ] * Unpromoted: [ fc16-builder2 ] - * SLAVE_IP (ocf:pacemaker:Dummy): Started fc16-builder - * MASTER_IP (ocf:pacemaker:Dummy): Started fc16-builder2 + * UNPROMOTED_IP (ocf:pacemaker:Dummy): Started fc16-builder + * PROMOTED_IP (ocf:pacemaker:Dummy): Started fc16-builder2 Transition Summary: - * Move SLAVE_IP ( fc16-builder -> fc16-builder2 ) - * Move MASTER_IP ( fc16-builder2 -> fc16-builder ) + * Move UNPROMOTED_IP ( fc16-builder -> fc16-builder2 ) + * Move PROMOTED_IP ( fc16-builder2 -> fc16-builder ) Executing Cluster Transition: - * Resource action: SLAVE_IP stop on fc16-builder - * Resource action: MASTER_IP stop on fc16-builder2 - * Resource action: SLAVE_IP start on fc16-builder2 - * Resource action: MASTER_IP start on fc16-builder + * Resource action: UNPROMOTED_IP stop on fc16-builder + * Resource action: PROMOTED_IP stop on fc16-builder2 + * Resource action: UNPROMOTED_IP start on fc16-builder2 + * Resource action: PROMOTED_IP start on fc16-builder Revised Cluster Status: * Node List: * Online: [ fc16-builder fc16-builder2 ] * Full List of Resources: * Clone Set: MS_DUMMY [DUMMY] (promotable): * Promoted: [ fc16-builder ] * Unpromoted: [ fc16-builder2 ] - * SLAVE_IP (ocf:pacemaker:Dummy): Started fc16-builder2 - * MASTER_IP (ocf:pacemaker:Dummy): Started fc16-builder + * UNPROMOTED_IP (ocf:pacemaker:Dummy): Started fc16-builder2 + * PROMOTED_IP (ocf:pacemaker:Dummy): Started fc16-builder diff --git a/cts/scheduler/xml/clbz5007-promotable-colocation.xml b/cts/scheduler/xml/clbz5007-promotable-colocation.xml index 5073af1478..76bb306259 100644 --- a/cts/scheduler/xml/clbz5007-promotable-colocation.xml +++ b/cts/scheduler/xml/clbz5007-promotable-colocation.xml @@ -1,88 +1,88 @@ - - + + - - - + + - - + - - + + - - +