diff --git a/pengine/group.c b/pengine/group.c
index 393b0154f0..9f60e81a5e 100644
--- a/pengine/group.c
+++ b/pengine/group.c
@@ -1,518 +1,519 @@
/*
* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <crm_internal.h>
#include <pengine.h>
#include <lib/pengine/utils.h>
#include <crm/msg_xml.h>
#include <allocate.h>
#include <utils.h>
#define VARIANT_GROUP 1
#include <lib/pengine/variant.h>
node_t *
group_color(resource_t *rsc, pe_working_set_t *data_set)
{
node_t *node = NULL;
node_t *group_node = NULL;
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
if(is_not_set(rsc->flags, pe_rsc_provisional)) {
return rsc->allocated_to;
}
crm_debug_2("Processing %s", rsc->id);
if(is_set(rsc->flags, pe_rsc_allocating)) {
crm_debug("Dependancy loop detected involving %s", rsc->id);
return NULL;
}
if(group_data->first_child == NULL) {
/* nothign to allocate */
clear_bit(rsc->flags, pe_rsc_provisional);
return NULL;
}
set_bit(rsc->flags, pe_rsc_allocating);
rsc->role = group_data->first_child->role;
group_data->first_child->rsc_cons = g_list_concat(
group_data->first_child->rsc_cons, rsc->rsc_cons);
rsc->rsc_cons = NULL;
group_data->first_child->rsc_cons_lhs = g_list_concat(
group_data->first_child->rsc_cons_lhs, rsc->rsc_cons_lhs);
rsc->rsc_cons_lhs = NULL;
dump_node_scores(show_scores?0:scores_log_level, rsc, __PRETTY_FUNCTION__, rsc->allowed_nodes);
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
node = child_rsc->cmds->color(child_rsc, data_set);
if(group_node == NULL) {
group_node = node;
}
);
rsc->next_role = group_data->first_child->next_role;
clear_bit(rsc->flags, pe_rsc_allocating);
clear_bit(rsc->flags, pe_rsc_provisional);
if(group_data->colocated) {
return group_node;
}
return NULL;
}
void group_update_pseudo_status(resource_t *parent, resource_t *child);
void group_create_actions(resource_t *rsc, pe_working_set_t *data_set)
{
action_t *op = NULL;
const char *value = NULL;
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
crm_debug_2("Creating actions for %s", rsc->id);
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
child_rsc->cmds->create_actions(child_rsc, data_set);
group_update_pseudo_status(rsc, child_rsc);
);
op = start_action(rsc, NULL, TRUE/* !group_data->child_starting */);
op->pseudo = TRUE;
op->runnable = TRUE;
op = custom_action(rsc, started_key(rsc),
RSC_STARTED, NULL,
TRUE/* !group_data->child_starting */, TRUE, data_set);
op->pseudo = TRUE;
op->runnable = TRUE;
op = stop_action(rsc, NULL, TRUE/* !group_data->child_stopping */);
op->pseudo = TRUE;
op->runnable = TRUE;
op = custom_action(rsc, stopped_key(rsc),
RSC_STOPPED, NULL,
TRUE/* !group_data->child_stopping */, TRUE, data_set);
op->pseudo = TRUE;
op->runnable = TRUE;
value = g_hash_table_lookup(rsc->meta, "stateful");
if(crm_is_true(value)) {
op = custom_action(rsc, demote_key(rsc), RSC_DEMOTE, NULL, TRUE, TRUE, data_set);
op->pseudo = TRUE; op->runnable = TRUE;
op = custom_action(rsc, demoted_key(rsc), RSC_DEMOTED, NULL, TRUE, TRUE, data_set);
op->pseudo = TRUE; op->runnable = TRUE;
op = custom_action(rsc, promote_key(rsc), RSC_PROMOTE, NULL, TRUE, TRUE, data_set);
op->pseudo = TRUE; op->runnable = TRUE;
op = custom_action(rsc, promoted_key(rsc), RSC_PROMOTED, NULL, TRUE, TRUE, data_set);
op->pseudo = TRUE; op->runnable = TRUE;
}
rsc->actions = rsc->actions;
/* rsc->actions = NULL; */
}
void
group_update_pseudo_status(resource_t *parent, resource_t *child)
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, parent);
if(group_data->ordered == FALSE) {
/* If this group is not ordered, then leave the meta-actions as optional */
return;
}
if(group_data->child_stopping && group_data->child_starting) {
return;
}
slist_iter(
action, action_t, child->actions, lpc,
if(action->optional) {
continue;
}
if(safe_str_eq(RSC_STOP, action->task) && action->runnable) {
group_data->child_stopping = TRUE;
crm_debug_3("Based on %s the group is stopping", action->uuid);
} else if(safe_str_eq(RSC_START, action->task) && action->runnable) {
group_data->child_starting = TRUE;
crm_debug_3("Based on %s the group is starting", action->uuid);
}
);
}
void group_internal_constraints(resource_t *rsc, pe_working_set_t *data_set)
{
const char *value = NULL;
gboolean stateful = FALSE;
resource_t *last_rsc = NULL;
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
native_internal_constraints(rsc, data_set);
value = g_hash_table_lookup(rsc->meta, "stateful");
stateful = crm_is_true(value);
new_rsc_order(rsc, RSC_STOPPED, rsc, RSC_START,
pe_order_optional, data_set);
new_rsc_order(rsc, RSC_STOP, rsc, RSC_STOPPED,
pe_order_runnable_left|pe_order_implies_right|pe_order_implies_left, data_set);
new_rsc_order(rsc, RSC_START, rsc, RSC_STARTED,
pe_order_runnable_left, data_set);
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
int stop = pe_order_shutdown|pe_order_implies_right;
int stopped = pe_order_implies_right_printed;
int start = pe_order_implies_right|pe_order_runnable_left;
int started = pe_order_runnable_left|pe_order_implies_right|pe_order_implies_right_printed;
child_rsc->cmds->internal_constraints(child_rsc, data_set);
if(last_rsc == NULL) {
if(group_data->ordered) {
stop |= pe_order_implies_left;
stopped = pe_order_implies_right;
}
} else if(group_data->colocated) {
rsc_colocation_new(
"group:internal_colocation", NULL, INFINITY,
child_rsc, last_rsc, NULL, NULL, data_set);
}
if(stateful) {
new_rsc_order(rsc, RSC_DEMOTE, child_rsc, RSC_DEMOTE,
stop|pe_order_implies_left_printed, data_set);
new_rsc_order(child_rsc, RSC_DEMOTE, rsc, RSC_DEMOTED, stopped, data_set);
new_rsc_order(child_rsc, RSC_PROMOTE, rsc, RSC_PROMOTED, started, data_set);
new_rsc_order(rsc, RSC_PROMOTE, child_rsc, RSC_PROMOTE,
pe_order_implies_left_printed, data_set);
}
order_start_start(rsc, child_rsc, pe_order_implies_left_printed);
order_stop_stop(rsc, child_rsc, stop|pe_order_implies_left_printed);
new_rsc_order(child_rsc, RSC_STOP, rsc, RSC_STOPPED, stopped, data_set);
new_rsc_order(child_rsc, RSC_START, rsc, RSC_STARTED, started, data_set);
if(group_data->ordered == FALSE) {
order_start_start(rsc, child_rsc, start|pe_order_implies_left_printed);
if(stateful) {
new_rsc_order(rsc, RSC_PROMOTE, child_rsc, RSC_PROMOTE,
start|pe_order_implies_left_printed, data_set);
}
} else if(last_rsc != NULL) {
child_rsc->restart_type = pe_restart_restart;
order_start_start(last_rsc, child_rsc, start);
order_stop_stop(child_rsc, last_rsc, pe_order_implies_left);
if(stateful) {
new_rsc_order(last_rsc, RSC_PROMOTE, child_rsc, RSC_PROMOTE, start, data_set);
new_rsc_order(child_rsc, RSC_DEMOTE, last_rsc, RSC_DEMOTE, pe_order_implies_left, data_set);
}
} else {
/* If anyone in the group is starting, then
* pe_order_implies_right will cause _everyone_ in the group
* to be sent a start action
* But this is safe since starting something that is already
* started is required to be "safe"
*/
int flags = pe_order_implies_left|pe_order_implies_right|pe_order_runnable_right|pe_order_runnable_left;
order_start_start(rsc, child_rsc, flags);
if(stateful) {
new_rsc_order(rsc, RSC_PROMOTE, child_rsc, RSC_PROMOTE, flags, data_set);
}
}
last_rsc = child_rsc;
);
if(group_data->ordered && last_rsc != NULL) {
int stop_stop_flags = pe_order_implies_right;
int stop_stopped_flags = pe_order_implies_left;
order_stop_stop(rsc, last_rsc, stop_stop_flags);
new_rsc_order(last_rsc, RSC_STOP, rsc, RSC_STOPPED, stop_stopped_flags, data_set);
if(stateful) {
new_rsc_order(rsc, RSC_DEMOTE, last_rsc, RSC_DEMOTE, stop_stop_flags, data_set);
new_rsc_order(last_rsc, RSC_DEMOTE, rsc, RSC_DEMOTED, stop_stopped_flags, data_set);
}
}
}
void group_rsc_colocation_lh(
resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
{
group_variant_data_t *group_data = NULL;
if(rsc_lh == NULL) {
pe_err("rsc_lh was NULL for %s", constraint->id);
return;
} else if(rsc_rh == NULL) {
pe_err("rsc_rh was NULL for %s", constraint->id);
return;
}
crm_debug_4("Processing constraints from %s", rsc_lh->id);
get_group_variant_data(group_data, rsc_lh);
if(group_data->colocated) {
group_data->first_child->cmds->rsc_colocation_lh(
group_data->first_child, rsc_rh, constraint);
return;
} else if(constraint->score >= INFINITY) {
crm_config_err("%s: Cannot perform manditory colocation"
" between non-colocated group and %s",
rsc_lh->id, rsc_rh->id);
return;
}
slist_iter(
child_rsc, resource_t, rsc_lh->children, lpc,
child_rsc->cmds->rsc_colocation_lh(
child_rsc, rsc_rh, constraint);
);
}
void group_rsc_colocation_rh(
resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc_rh);
CRM_CHECK(rsc_lh->variant == pe_native, return);
crm_debug_3("Processing RH of constraint %s", constraint->id);
print_resource(LOG_DEBUG_3, "LHS", rsc_lh, TRUE);
if(is_set(rsc_rh->flags, pe_rsc_provisional)) {
return;
} else if(group_data->colocated && group_data->first_child) {
group_data->first_child->cmds->rsc_colocation_rh(
rsc_lh, group_data->first_child, constraint);
return;
} else if(constraint->score >= INFINITY) {
crm_config_err("%s: Cannot perform manditory colocation with"
" non-colocated group: %s", rsc_lh->id, rsc_rh->id);
return;
}
slist_iter(
child_rsc, resource_t, rsc_rh->children, lpc,
child_rsc->cmds->rsc_colocation_rh(
rsc_lh, child_rsc, constraint);
);
}
void group_rsc_order_lh(resource_t *rsc, order_constraint_t *order, pe_working_set_t *data_set)
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
crm_debug_4("%s->%s", order->lh_action_task, order->rh_action_task);
if(order->rh_rsc != NULL
&& (rsc == order->rh_rsc || rsc == order->rh_rsc->parent)) {
native_rsc_order_lh(rsc, order, data_set);
return;
}
#if 0
if(order->type != pe_order_optional) {
native_rsc_order_lh(rsc, order, data_set);
}
if(order->type & pe_order_implies_left) {
native_rsc_order_lh(group_data->first_child, order, data_set);
}
#endif
order->lh_action_task = convert_non_atomic_task(
order->lh_action_task, is_set(rsc->flags, pe_rsc_notify), TRUE);
native_rsc_order_lh(rsc, order, data_set);
}
void group_rsc_order_rh(
action_t *lh_action, resource_t *rsc, order_constraint_t *order)
{
enum pe_ordering type = order->type;
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
crm_debug_3("%s/%p: %s->%s", rsc->id, order, lh_action->uuid, order->rh_action_task);
if(rsc == NULL) {
return;
}
if(safe_str_eq(CRM_OP_PROBED, lh_action->uuid)) {
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
child_rsc->cmds->rsc_order_rh(lh_action, child_rsc, order);
);
if(rsc->fns->state(rsc, TRUE) < RSC_ROLE_STARTED
&& rsc->fns->state(rsc, FALSE) > RSC_ROLE_STOPPED) {
order->type |= pe_order_implies_right;
}
} else if(lh_action->rsc != NULL
&& lh_action->rsc != rsc
&& lh_action->rsc != rsc->parent
&& lh_action->rsc->parent != rsc) {
char *tmp = NULL;
char *task_s = NULL;
int interval = 0;
enum action_tasks task = 0;
parse_op_key(order->lh_action_task, &tmp, &task_s, &interval);
task = text2task(task_s);
crm_free(task_s);
crm_free(tmp);
switch(task) {
case no_action:
case monitor_rsc:
case action_notify:
case action_notified:
case shutdown_crm:
case stonith_node:
break;
case stop_rsc:
case stopped_rsc:
case action_demote:
case action_demoted:
order->type |= pe_order_complex_left;
break;
case start_rsc:
case started_rsc:
case action_promote:
case action_promoted:
order->type |= pe_order_complex_right;
break;
}
}
native_rsc_order_rh(lh_action, rsc, order);
order->type = type;
}
void group_rsc_location(resource_t *rsc, rsc_to_node_t *constraint)
{
GListPtr saved = constraint->node_list_rh;
GListPtr zero = node_list_dup(constraint->node_list_rh, TRUE, FALSE);
gboolean reset_scores = TRUE;
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
crm_debug("Processing rsc_location %s for %s",
constraint->id, rsc->id);
+ native_rsc_location(rsc, constraint);
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
child_rsc->cmds->rsc_location(child_rsc, constraint);
if(group_data->colocated && reset_scores) {
reset_scores = FALSE;
constraint->node_list_rh = zero;
}
);
constraint->node_list_rh = saved;
pe_free_shallow_adv(zero, TRUE);
}
void group_expand(resource_t *rsc, pe_working_set_t *data_set)
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
crm_debug_3("Processing actions from %s", rsc->id);
CRM_CHECK(rsc != NULL, return);
native_expand(rsc, data_set);
slist_iter(
child_rsc, resource_t, rsc->children, lpc,
child_rsc->cmds->expand(child_rsc, data_set);
);
}
GListPtr
group_merge_weights(
resource_t *rsc, const char *rhs, GListPtr nodes, const char *attr, int factor, gboolean allow_rollback)
{
group_variant_data_t *group_data = NULL;
get_group_variant_data(group_data, rsc);
if(is_set(rsc->flags, pe_rsc_merging)) {
crm_info("Breaking dependancy loop with %s at %s", rsc->id, rhs);
return nodes;
}
set_bit(rsc->flags, pe_rsc_merging);
nodes = group_data->first_child->cmds->merge_weights(
group_data->first_child, rhs, nodes, attr, factor, allow_rollback);
slist_iter(
constraint, rsc_colocation_t, rsc->rsc_cons_lhs, lpc,
nodes = native_merge_weights(
constraint->rsc_lh, rsc->id, nodes,
constraint->node_attribute,
constraint->score/INFINITY, allow_rollback);
);
clear_bit(rsc->flags, pe_rsc_merging);
return nodes;
}
diff --git a/pengine/test10/1360.scores b/pengine/test10/1360.scores
index 1b91b8e41d..d61c19c017 100644
--- a/pengine/test10/1360.scores
+++ b/pengine/test10/1360.scores
@@ -1,13 +1,13 @@
Allocation scores:
-group_color: ClusterAlias allocation score on ssgtest1a: 0
+group_color: ClusterAlias allocation score on ssgtest1a: 1000000
group_color: ClusterAlias allocation score on ssgtest1b: 0
group_color: VIP allocation score on ssgtest1a: 1000000
group_color: VIP allocation score on ssgtest1b: 0
native_color: VIP allocation score on ssgtest1a: 1000000
native_color: VIP allocation score on ssgtest1b: 0
clone_color: dolly allocation score on ssgtest1a: 0
clone_color: dolly allocation score on ssgtest1b: 1000000
clone_color: dollies:0 allocation score on ssgtest1a: 0
clone_color: dollies:0 allocation score on ssgtest1b: 1000000
native_color: dollies:0 allocation score on ssgtest1a: 0
native_color: dollies:0 allocation score on ssgtest1b: 1000000
diff --git a/pengine/test10/bug-1573.scores b/pengine/test10/bug-1573.scores
index 82402ba5fe..75dfd020f1 100644
--- a/pengine/test10/bug-1573.scores
+++ b/pengine/test10/bug-1573.scores
@@ -1,21 +1,21 @@
Allocation scores:
group_color: group_1 allocation score on xen-c: 0
-group_color: group_1 allocation score on xen-b: 0
+group_color: group_1 allocation score on xen-b: 100
group_color: IPaddr_192_168_1_101 allocation score on xen-c: 0
group_color: IPaddr_192_168_1_101 allocation score on xen-b: 100
group_color: apache_2 allocation score on xen-c: 0
group_color: apache_2 allocation score on xen-b: 0
native_color: IPaddr_192_168_1_101 allocation score on xen-c: 0
native_color: IPaddr_192_168_1_101 allocation score on xen-b: 100
native_color: apache_2 allocation score on xen-c: -1000000
native_color: apache_2 allocation score on xen-b: -1000000
-group_color: group_11 allocation score on xen-c: 0
+group_color: group_11 allocation score on xen-c: 100
group_color: group_11 allocation score on xen-b: 0
group_color: IPaddr_192_168_1_102 allocation score on xen-c: 100
group_color: IPaddr_192_168_1_102 allocation score on xen-b: 0
group_color: apache_6 allocation score on xen-c: 0
group_color: apache_6 allocation score on xen-b: 0
native_color: IPaddr_192_168_1_102 allocation score on xen-c: 100
native_color: IPaddr_192_168_1_102 allocation score on xen-b: 0
native_color: apache_6 allocation score on xen-c: -1000000
native_color: apache_6 allocation score on xen-b: -1000000
diff --git a/pengine/test10/bug-1718.scores b/pengine/test10/bug-1718.scores
index 067099d1a4..30dd02628a 100644
--- a/pengine/test10/bug-1718.scores
+++ b/pengine/test10/bug-1718.scores
@@ -1,61 +1,61 @@
Allocation scores:
-group_color: Web_Group allocation score on defiant.ds9: 0
+group_color: Web_Group allocation score on defiant.ds9: 100
group_color: Web_Group allocation score on heartbeat.ds9: 0
group_color: Web_Group allocation score on ops.ds9: 0
group_color: Web_Group allocation score on biggame.ds9: 0
group_color: Web_Group allocation score on warbird.ds9: 0
group_color: Apache_IP allocation score on defiant.ds9: 100
group_color: Apache_IP allocation score on heartbeat.ds9: 0
group_color: Apache_IP allocation score on ops.ds9: 0
group_color: Apache_IP allocation score on biggame.ds9: 0
group_color: Apache_IP allocation score on warbird.ds9: 0
group_color: resource_IP2 allocation score on defiant.ds9: 0
group_color: resource_IP2 allocation score on heartbeat.ds9: 0
group_color: resource_IP2 allocation score on ops.ds9: 0
group_color: resource_IP2 allocation score on biggame.ds9: 0
group_color: resource_IP2 allocation score on warbird.ds9: 0
group_color: resource_dummyweb allocation score on defiant.ds9: 0
group_color: resource_dummyweb allocation score on heartbeat.ds9: 0
group_color: resource_dummyweb allocation score on ops.ds9: 0
group_color: resource_dummyweb allocation score on biggame.ds9: 0
group_color: resource_dummyweb allocation score on warbird.ds9: 0
native_color: Apache_IP allocation score on defiant.ds9: -1000000
native_color: Apache_IP allocation score on heartbeat.ds9: 0
native_color: Apache_IP allocation score on ops.ds9: 0
native_color: Apache_IP allocation score on biggame.ds9: 0
native_color: Apache_IP allocation score on warbird.ds9: -1000000
native_color: resource_IP2 allocation score on defiant.ds9: -1000000
native_color: resource_IP2 allocation score on heartbeat.ds9: -1000000
native_color: resource_IP2 allocation score on ops.ds9: -1000000
native_color: resource_IP2 allocation score on biggame.ds9: -1000000
native_color: resource_IP2 allocation score on warbird.ds9: -1000000
native_color: resource_dummyweb allocation score on defiant.ds9: -1000000
native_color: resource_dummyweb allocation score on heartbeat.ds9: -1000000
native_color: resource_dummyweb allocation score on ops.ds9: -1000000
native_color: resource_dummyweb allocation score on biggame.ds9: -1000000
native_color: resource_dummyweb allocation score on warbird.ds9: -1000000
group_color: group_fUN allocation score on defiant.ds9: 0
group_color: group_fUN allocation score on heartbeat.ds9: 0
group_color: group_fUN allocation score on ops.ds9: 0
group_color: group_fUN allocation score on biggame.ds9: 0
group_color: group_fUN allocation score on warbird.ds9: 0
group_color: resource_IP3 allocation score on defiant.ds9: 0
group_color: resource_IP3 allocation score on heartbeat.ds9: 0
group_color: resource_IP3 allocation score on ops.ds9: 0
group_color: resource_IP3 allocation score on biggame.ds9: 0
group_color: resource_IP3 allocation score on warbird.ds9: 0
group_color: resource_dummy allocation score on defiant.ds9: 0
group_color: resource_dummy allocation score on heartbeat.ds9: 0
group_color: resource_dummy allocation score on ops.ds9: 0
group_color: resource_dummy allocation score on biggame.ds9: 0
group_color: resource_dummy allocation score on warbird.ds9: 0
native_color: resource_IP3 allocation score on defiant.ds9: -1000000
native_color: resource_IP3 allocation score on heartbeat.ds9: 0
native_color: resource_IP3 allocation score on ops.ds9: 0
native_color: resource_IP3 allocation score on biggame.ds9: 0
native_color: resource_IP3 allocation score on warbird.ds9: -1000000
native_color: resource_dummy allocation score on defiant.ds9: -1000000
native_color: resource_dummy allocation score on heartbeat.ds9: -1000000
native_color: resource_dummy allocation score on ops.ds9: 0
native_color: resource_dummy allocation score on biggame.ds9: -1000000
native_color: resource_dummy allocation score on warbird.ds9: -1000000
diff --git a/pengine/test10/bug-1820-1.scores b/pengine/test10/bug-1820-1.scores
index 6d47f682d1..cddc5c11b8 100644
--- a/pengine/test10/bug-1820-1.scores
+++ b/pengine/test10/bug-1820-1.scores
@@ -1,11 +1,13 @@
Allocation scores:
native_color: p1 allocation score on star: -1000000
native_color: p1 allocation score on world: 2000
+group_color: gr1 allocation score on star: 1000000
+group_color: gr1 allocation score on world: 1000
group_color: test1 allocation score on star: 1000000
group_color: test1 allocation score on world: 1000
group_color: test2 allocation score on star: 0
group_color: test2 allocation score on world: 0
native_color: test1 allocation score on star: -1000000
native_color: test1 allocation score on world: 1000
native_color: test2 allocation score on star: -1000000
native_color: test2 allocation score on world: 0
diff --git a/pengine/test10/bug-1820.scores b/pengine/test10/bug-1820.scores
index 88b1bbf6b8..8e535a2836 100644
--- a/pengine/test10/bug-1820.scores
+++ b/pengine/test10/bug-1820.scores
@@ -1,9 +1,11 @@
Allocation scores:
+group_color: gr1 allocation score on star: 1000000
+group_color: gr1 allocation score on world: 1000
group_color: test1 allocation score on star: 1000000
group_color: test1 allocation score on world: 1000
group_color: test2 allocation score on star: 0
group_color: test2 allocation score on world: 0
native_color: test1 allocation score on star: -1000000
native_color: test1 allocation score on world: 1000
native_color: test2 allocation score on star: -1000000
native_color: test2 allocation score on world: 0
diff --git a/pengine/test10/bug-n-387749.scores b/pengine/test10/bug-n-387749.scores
index 1e06ec1e6d..ee2fdc1bff 100644
--- a/pengine/test10/bug-n-387749.scores
+++ b/pengine/test10/bug-n-387749.scores
@@ -1,37 +1,37 @@
Allocation scores:
clone_color: export_home_ocfs2_clone_set allocation score on power720-1: 1000000
clone_color: export_home_ocfs2_clone_set allocation score on power720-2: 2000
clone_color: export_home_ocfs2_clone_set allocation score on power720-4: -1000000
clone_color: export_home_ocfs2:0 allocation score on power720-1: 0
clone_color: export_home_ocfs2:0 allocation score on power720-2: 0
clone_color: export_home_ocfs2:0 allocation score on power720-4: 0
clone_color: export_home_ocfs2:1 allocation score on power720-1: 0
clone_color: export_home_ocfs2:1 allocation score on power720-2: 1
clone_color: export_home_ocfs2:1 allocation score on power720-4: 0
clone_color: export_home_ocfs2:2 allocation score on power720-1: 0
clone_color: export_home_ocfs2:2 allocation score on power720-2: 0
clone_color: export_home_ocfs2:2 allocation score on power720-4: 0
native_color: export_home_ocfs2:1 allocation score on power720-1: 0
native_color: export_home_ocfs2:1 allocation score on power720-2: 1
native_color: export_home_ocfs2:1 allocation score on power720-4: -1000000
native_color: export_home_ocfs2:0 allocation score on power720-1: 0
native_color: export_home_ocfs2:0 allocation score on power720-2: -1000000
native_color: export_home_ocfs2:0 allocation score on power720-4: -1000000
native_color: export_home_ocfs2:2 allocation score on power720-1: -1000000
native_color: export_home_ocfs2:2 allocation score on power720-2: -1000000
native_color: export_home_ocfs2:2 allocation score on power720-4: -1000000
-group_color: group_nfs allocation score on power720-1: 0
+group_color: group_nfs allocation score on power720-1: 1000000
group_color: group_nfs allocation score on power720-2: 0
group_color: group_nfs allocation score on power720-4: 0
group_color: resource_ipaddr1_single allocation score on power720-1: 1000000
group_color: resource_ipaddr1_single allocation score on power720-2: 1000
group_color: resource_ipaddr1_single allocation score on power720-4: 0
group_color: resource_nfsserver_single allocation score on power720-1: 0
group_color: resource_nfsserver_single allocation score on power720-2: 1000
group_color: resource_nfsserver_single allocation score on power720-4: 0
native_color: resource_ipaddr1_single allocation score on power720-1: 1000000
native_color: resource_ipaddr1_single allocation score on power720-2: 2001
native_color: resource_ipaddr1_single allocation score on power720-4: -1000000
native_color: resource_nfsserver_single allocation score on power720-1: 0
native_color: resource_nfsserver_single allocation score on power720-2: -1000000
native_color: resource_nfsserver_single allocation score on power720-4: -1000000
diff --git a/pengine/test10/coloc-attr.scores b/pengine/test10/coloc-attr.scores
index 21a117102c..06bffb9d84 100644
--- a/pengine/test10/coloc-attr.scores
+++ b/pengine/test10/coloc-attr.scores
@@ -1,25 +1,25 @@
Allocation scores:
group_color: group_test1 allocation score on power720-1: 0
-group_color: group_test1 allocation score on power720-2: 0
+group_color: group_test1 allocation score on power720-2: -1000000
group_color: group_test1 allocation score on power720-3: 0
-group_color: group_test1 allocation score on power720-4: 0
+group_color: group_test1 allocation score on power720-4: -1000000
group_color: resource_t11 allocation score on power720-1: 0
group_color: resource_t11 allocation score on power720-2: -1000000
group_color: resource_t11 allocation score on power720-3: 0
group_color: resource_t11 allocation score on power720-4: -1000000
native_color: resource_t11 allocation score on power720-1: -1000000
native_color: resource_t11 allocation score on power720-2: -1000000
native_color: resource_t11 allocation score on power720-3: 0
native_color: resource_t11 allocation score on power720-4: -1000000
-group_color: group_test2 allocation score on power720-1: 0
-group_color: group_test2 allocation score on power720-2: 0
-group_color: group_test2 allocation score on power720-3: 0
+group_color: group_test2 allocation score on power720-1: -1000000
+group_color: group_test2 allocation score on power720-2: -1000000
+group_color: group_test2 allocation score on power720-3: -1000000
group_color: group_test2 allocation score on power720-4: 0
group_color: resource_t21 allocation score on power720-1: -1000000
group_color: resource_t21 allocation score on power720-2: -1000000
group_color: resource_t21 allocation score on power720-3: -1000000
group_color: resource_t21 allocation score on power720-4: 0
native_color: resource_t21 allocation score on power720-1: -1000000
native_color: resource_t21 allocation score on power720-2: -1000000
native_color: resource_t21 allocation score on power720-3: -1000000
native_color: resource_t21 allocation score on power720-4: 0
diff --git a/pengine/test10/date-2.scores b/pengine/test10/date-2.scores
index 5111dddd18..5e200d0987 100644
--- a/pengine/test10/date-2.scores
+++ b/pengine/test10/date-2.scores
@@ -1,11 +1,11 @@
Allocation scores:
-group_color: test allocation score on router1: 0
+group_color: test allocation score on router1: 100
group_color: test allocation score on router2: 0
group_color: test_ip allocation score on router1: 100
group_color: test_ip allocation score on router2: 0
group_color: test_mailto allocation score on router1: 0
group_color: test_mailto allocation score on router2: 0
native_color: test_ip allocation score on router1: 100
native_color: test_ip allocation score on router2: 0
native_color: test_mailto allocation score on router1: -1000000
native_color: test_mailto allocation score on router2: -1000000
diff --git a/pengine/test10/date-3.scores b/pengine/test10/date-3.scores
index 5111dddd18..5e200d0987 100644
--- a/pengine/test10/date-3.scores
+++ b/pengine/test10/date-3.scores
@@ -1,11 +1,11 @@
Allocation scores:
-group_color: test allocation score on router1: 0
+group_color: test allocation score on router1: 100
group_color: test allocation score on router2: 0
group_color: test_ip allocation score on router1: 100
group_color: test_ip allocation score on router2: 0
group_color: test_mailto allocation score on router1: 0
group_color: test_mailto allocation score on router2: 0
native_color: test_ip allocation score on router1: 100
native_color: test_ip allocation score on router2: 0
native_color: test_mailto allocation score on router1: -1000000
native_color: test_mailto allocation score on router2: -1000000
diff --git a/pengine/test10/group4.scores b/pengine/test10/group4.scores
index f24c6fe2c7..25b4163c24 100644
--- a/pengine/test10/group4.scores
+++ b/pengine/test10/group4.scores
@@ -1,19 +1,19 @@
Allocation scores:
native_color: rsc1 allocation score on node1: 0
native_color: rsc1 allocation score on node2: 1
group_color: rsc2 allocation score on node1: 0
-group_color: rsc2 allocation score on node2: 0
+group_color: rsc2 allocation score on node2: 1
group_color: child_rsc1 allocation score on node1: 0
group_color: child_rsc1 allocation score on node2: 1
group_color: child_rsc2 allocation score on node1: 0
group_color: child_rsc2 allocation score on node2: 0
group_color: child_rsc3 allocation score on node1: 0
group_color: child_rsc3 allocation score on node2: 0
native_color: child_rsc1 allocation score on node1: 0
native_color: child_rsc1 allocation score on node2: 1
native_color: child_rsc2 allocation score on node1: -1000000
native_color: child_rsc2 allocation score on node2: 0
native_color: child_rsc3 allocation score on node1: -1000000
native_color: child_rsc3 allocation score on node2: 0
native_color: rsc3 allocation score on node1: 0
native_color: rsc3 allocation score on node2: 1
diff --git a/pengine/test10/group5.scores b/pengine/test10/group5.scores
index f24c6fe2c7..25b4163c24 100644
--- a/pengine/test10/group5.scores
+++ b/pengine/test10/group5.scores
@@ -1,19 +1,19 @@
Allocation scores:
native_color: rsc1 allocation score on node1: 0
native_color: rsc1 allocation score on node2: 1
group_color: rsc2 allocation score on node1: 0
-group_color: rsc2 allocation score on node2: 0
+group_color: rsc2 allocation score on node2: 1
group_color: child_rsc1 allocation score on node1: 0
group_color: child_rsc1 allocation score on node2: 1
group_color: child_rsc2 allocation score on node1: 0
group_color: child_rsc2 allocation score on node2: 0
group_color: child_rsc3 allocation score on node1: 0
group_color: child_rsc3 allocation score on node2: 0
native_color: child_rsc1 allocation score on node1: 0
native_color: child_rsc1 allocation score on node2: 1
native_color: child_rsc2 allocation score on node1: -1000000
native_color: child_rsc2 allocation score on node2: 0
native_color: child_rsc3 allocation score on node1: -1000000
native_color: child_rsc3 allocation score on node2: 0
native_color: rsc3 allocation score on node1: 0
native_color: rsc3 allocation score on node2: 1
diff --git a/pengine/test10/group6.scores b/pengine/test10/group6.scores
index b974147e6c..43f5186d82 100644
--- a/pengine/test10/group6.scores
+++ b/pengine/test10/group6.scores
@@ -1,29 +1,29 @@
Allocation scores:
group_color: rsc1 allocation score on node1: 0
-group_color: rsc1 allocation score on node2: 0
+group_color: rsc1 allocation score on node2: 1
group_color: child_rsc1 allocation score on node1: 0
group_color: child_rsc1 allocation score on node2: 1
group_color: child_rsc2 allocation score on node1: 0
group_color: child_rsc2 allocation score on node2: 0
group_color: child_rsc3 allocation score on node1: 0
group_color: child_rsc3 allocation score on node2: 0
native_color: child_rsc1 allocation score on node1: 0
native_color: child_rsc1 allocation score on node2: 1
native_color: child_rsc2 allocation score on node1: -1000000
native_color: child_rsc2 allocation score on node2: 0
native_color: child_rsc3 allocation score on node1: -1000000
native_color: child_rsc3 allocation score on node2: 0
group_color: rsc2 allocation score on node1: 0
-group_color: rsc2 allocation score on node2: 0
+group_color: rsc2 allocation score on node2: 1
group_color: child_rsc4 allocation score on node1: 0
group_color: child_rsc4 allocation score on node2: 1
group_color: child_rsc5 allocation score on node1: 0
group_color: child_rsc5 allocation score on node2: 0
group_color: child_rsc6 allocation score on node1: 0
group_color: child_rsc6 allocation score on node2: 0
native_color: child_rsc4 allocation score on node1: 0
native_color: child_rsc4 allocation score on node2: 1
native_color: child_rsc5 allocation score on node1: -1000000
native_color: child_rsc5 allocation score on node2: 0
native_color: child_rsc6 allocation score on node1: -1000000
native_color: child_rsc6 allocation score on node2: 0
diff --git a/pengine/test10/master-group.scores b/pengine/test10/master-group.scores
index 88cb4c87ff..16636b9302 100644
--- a/pengine/test10/master-group.scores
+++ b/pengine/test10/master-group.scores
@@ -1,31 +1,31 @@
Allocation scores:
-group_color: test allocation score on rh44-1: 0
-group_color: test allocation score on rh44-2: 0
+group_color: test allocation score on rh44-1: 200
+group_color: test allocation score on rh44-2: 100
group_color: resource_1 allocation score on rh44-1: 1000000
group_color: resource_1 allocation score on rh44-2: 100
native_color: resource_1 allocation score on rh44-1: 1000000
native_color: resource_1 allocation score on rh44-2: 100
clone_color: ms-sf allocation score on rh44-1: 0
clone_color: ms-sf allocation score on rh44-2: 0
clone_color: grp_ms_sf:0 allocation score on rh44-1: 0
clone_color: grp_ms_sf:0 allocation score on rh44-2: 0
clone_color: master_slave_Stateful:0 allocation score on rh44-1: 0
clone_color: master_slave_Stateful:0 allocation score on rh44-2: 1
clone_color: grp_ms_sf:1 allocation score on rh44-1: 0
clone_color: grp_ms_sf:1 allocation score on rh44-2: 0
clone_color: master_slave_Stateful:1 allocation score on rh44-1: 1
clone_color: master_slave_Stateful:1 allocation score on rh44-2: 0
group_color: grp_ms_sf:0 allocation score on rh44-1: 0
group_color: grp_ms_sf:0 allocation score on rh44-2: 0
group_color: master_slave_Stateful:0 allocation score on rh44-1: 0
group_color: master_slave_Stateful:0 allocation score on rh44-2: 1
native_color: master_slave_Stateful:0 allocation score on rh44-1: 0
native_color: master_slave_Stateful:0 allocation score on rh44-2: 1
group_color: grp_ms_sf:1 allocation score on rh44-1: 0
group_color: grp_ms_sf:1 allocation score on rh44-2: -1000000
group_color: master_slave_Stateful:1 allocation score on rh44-1: 1
group_color: master_slave_Stateful:1 allocation score on rh44-2: -1000000
native_color: master_slave_Stateful:1 allocation score on rh44-1: 1
native_color: master_slave_Stateful:1 allocation score on rh44-2: -1000000
grp_ms_sf:1 promotion score on rh44-1: 99
grp_ms_sf:0 promotion score on rh44-2: 49
diff --git a/pengine/test10/master-ordering.scores b/pengine/test10/master-ordering.scores
index a732c9e5fb..a2e86c2598 100644
--- a/pengine/test10/master-ordering.scores
+++ b/pengine/test10/master-ordering.scores
@@ -1,93 +1,93 @@
Allocation scores:
clone_color: ms_drbd_mysql allocation score on webcluster01: 100
clone_color: ms_drbd_mysql allocation score on webcluster02: -1000000
clone_color: drbd_mysql:0 allocation score on webcluster01: 0
clone_color: drbd_mysql:0 allocation score on webcluster02: 0
clone_color: drbd_mysql:1 allocation score on webcluster01: 0
clone_color: drbd_mysql:1 allocation score on webcluster02: 0
native_color: drbd_mysql:0 allocation score on webcluster01: 0
native_color: drbd_mysql:0 allocation score on webcluster02: -1000000
native_color: drbd_mysql:1 allocation score on webcluster01: -1000000
native_color: drbd_mysql:1 allocation score on webcluster02: -1000000
drbd_mysql:1 promotion score on none: 0
drbd_mysql:0 promotion score on webcluster01: -1
native_color: fs_mysql allocation score on webcluster01: -1000000
native_color: fs_mysql allocation score on webcluster02: -1000000
native_color: mysql-server allocation score on webcluster01: -1000000
native_color: mysql-server allocation score on webcluster02: -1000000
native_color: extip_1 allocation score on webcluster01: 100
native_color: extip_1 allocation score on webcluster02: 0
native_color: extip_2 allocation score on webcluster01: 0
native_color: extip_2 allocation score on webcluster02: 100
-group_color: group_main allocation score on webcluster01: 0
+group_color: group_main allocation score on webcluster01: 100
group_color: group_main allocation score on webcluster02: 0
group_color: intip_0_main allocation score on webcluster01: 100
group_color: intip_0_main allocation score on webcluster02: 0
native_color: intip_0_main allocation score on webcluster01: -1000000
native_color: intip_0_main allocation score on webcluster02: -1000000
native_color: intip_1_master allocation score on webcluster01: 200
native_color: intip_1_master allocation score on webcluster02: 0
native_color: intip_2_slave allocation score on webcluster01: 0
native_color: intip_2_slave allocation score on webcluster02: 100
clone_color: ms_drbd_www allocation score on webcluster01: 0
clone_color: ms_drbd_www allocation score on webcluster02: -1000000
clone_color: drbd_www:0 allocation score on webcluster01: 0
clone_color: drbd_www:0 allocation score on webcluster02: 0
clone_color: drbd_www:1 allocation score on webcluster01: 0
clone_color: drbd_www:1 allocation score on webcluster02: 0
native_color: drbd_www:0 allocation score on webcluster01: 0
native_color: drbd_www:0 allocation score on webcluster02: -1000000
native_color: drbd_www:1 allocation score on webcluster01: -1000000
native_color: drbd_www:1 allocation score on webcluster02: -1000000
drbd_www:1 promotion score on none: 0
drbd_www:0 promotion score on webcluster01: -1
clone_color: clone_ocfs2_www allocation score on webcluster01: 0
clone_color: clone_ocfs2_www allocation score on webcluster02: -1000000
clone_color: ocfs2_www:0 allocation score on webcluster01: 0
clone_color: ocfs2_www:0 allocation score on webcluster02: 0
clone_color: ocfs2_www:1 allocation score on webcluster01: 0
clone_color: ocfs2_www:1 allocation score on webcluster02: 0
drbd_www:1 promotion score on none: 0
drbd_www:0 promotion score on webcluster01: -1000000
native_color: ocfs2_www:0 allocation score on webcluster01: -1000000
native_color: ocfs2_www:0 allocation score on webcluster02: -1000000
drbd_www:1 promotion score on none: 0
drbd_www:0 promotion score on webcluster01: -1000000
native_color: ocfs2_www:1 allocation score on webcluster01: -1000000
native_color: ocfs2_www:1 allocation score on webcluster02: -1000000
clone_color: clone_webservice allocation score on webcluster01: 0
clone_color: clone_webservice allocation score on webcluster02: 0
clone_color: group_webservice:0 allocation score on webcluster01: 0
clone_color: group_webservice:0 allocation score on webcluster02: 0
clone_color: apache2:0 allocation score on webcluster01: 0
clone_color: apache2:0 allocation score on webcluster02: 0
clone_color: mysql-proxy:0 allocation score on webcluster01: 0
clone_color: mysql-proxy:0 allocation score on webcluster02: 0
clone_color: group_webservice:1 allocation score on webcluster01: 0
clone_color: group_webservice:1 allocation score on webcluster02: 0
clone_color: apache2:1 allocation score on webcluster01: 0
clone_color: apache2:1 allocation score on webcluster02: 0
clone_color: mysql-proxy:1 allocation score on webcluster01: 0
clone_color: mysql-proxy:1 allocation score on webcluster02: 0
group_color: group_webservice:0 allocation score on webcluster01: 0
group_color: group_webservice:0 allocation score on webcluster02: -1000000
group_color: apache2:0 allocation score on webcluster01: 0
group_color: apache2:0 allocation score on webcluster02: -1000000
group_color: mysql-proxy:0 allocation score on webcluster01: 0
group_color: mysql-proxy:0 allocation score on webcluster02: -1000000
native_color: apache2:0 allocation score on webcluster01: -1000000
native_color: apache2:0 allocation score on webcluster02: -1000000
native_color: mysql-proxy:0 allocation score on webcluster01: -1000000
native_color: mysql-proxy:0 allocation score on webcluster02: -1000000
group_color: group_webservice:1 allocation score on webcluster01: 0
group_color: group_webservice:1 allocation score on webcluster02: -1000000
group_color: apache2:1 allocation score on webcluster01: 0
group_color: apache2:1 allocation score on webcluster02: -1000000
group_color: mysql-proxy:1 allocation score on webcluster01: 0
group_color: mysql-proxy:1 allocation score on webcluster02: -1000000
native_color: apache2:1 allocation score on webcluster01: -1000000
native_color: apache2:1 allocation score on webcluster02: -1000000
native_color: mysql-proxy:1 allocation score on webcluster01: -1000000
native_color: mysql-proxy:1 allocation score on webcluster02: -1000000
drbd_mysql:1 promotion score on none: 0
drbd_mysql:0 promotion score on webcluster01: -1000000
diff --git a/pengine/test10/master-reattach.scores b/pengine/test10/master-reattach.scores
index 8f03a40f63..43154f340b 100644
--- a/pengine/test10/master-reattach.scores
+++ b/pengine/test10/master-reattach.scores
@@ -1,29 +1,29 @@
Allocation scores:
clone_color: ms-drbd1 allocation score on dktest1: 1000000
clone_color: ms-drbd1 allocation score on dktest2: 0
clone_color: drbd1:0 allocation score on dktest1: 1000000
clone_color: drbd1:0 allocation score on dktest2: 0
clone_color: drbd1:1 allocation score on dktest1: 0
clone_color: drbd1:1 allocation score on dktest2: 1000000
native_color: drbd1:0 allocation score on dktest1: 1000000
native_color: drbd1:0 allocation score on dktest2: 0
native_color: drbd1:1 allocation score on dktest1: -1000000
native_color: drbd1:1 allocation score on dktest2: 1000000
drbd1:0 promotion score on dktest1: 1000000
drbd1:1 promotion score on dktest2: -1
-group_color: apache allocation score on dktest1: 0
+group_color: apache allocation score on dktest1: 500
group_color: apache allocation score on dktest2: 0
group_color: apache-vip allocation score on dktest1: 1000000
group_color: apache-vip allocation score on dktest2: 0
group_color: mount allocation score on dktest1: 1000000
group_color: mount allocation score on dktest2: 0
group_color: webserver allocation score on dktest1: 1000000
group_color: webserver allocation score on dktest2: 0
drbd1:0 promotion score on dktest1: 1000000
drbd1:1 promotion score on dktest2: -1000000
native_color: apache-vip allocation score on dktest1: 1000000
native_color: apache-vip allocation score on dktest2: -1000000
native_color: mount allocation score on dktest1: 1000000
native_color: mount allocation score on dktest2: -1000000
native_color: webserver allocation score on dktest1: 1000000
native_color: webserver allocation score on dktest2: -1000000
diff --git a/pengine/test10/rec-node-15.scores b/pengine/test10/rec-node-15.scores
index 9c14937b32..1810748266 100644
--- a/pengine/test10/rec-node-15.scores
+++ b/pengine/test10/rec-node-15.scores
@@ -1,79 +1,79 @@
Allocation scores:
native_color: stonith-1 allocation score on sapcl03: 0
native_color: stonith-1 allocation score on sapcl02: 0
native_color: stonith-1 allocation score on sapcl01: 0
group_color: app01 allocation score on sapcl03: 0
group_color: app01 allocation score on sapcl02: 0
-group_color: app01 allocation score on sapcl01: 0
+group_color: app01 allocation score on sapcl01: 100
group_color: IPaddr_192_168_1_101 allocation score on sapcl03: 0
group_color: IPaddr_192_168_1_101 allocation score on sapcl02: 0
group_color: IPaddr_192_168_1_101 allocation score on sapcl01: 100
group_color: LVM_2 allocation score on sapcl03: 0
group_color: LVM_2 allocation score on sapcl02: 0
group_color: LVM_2 allocation score on sapcl01: 0
group_color: Filesystem_3 allocation score on sapcl03: 0
group_color: Filesystem_3 allocation score on sapcl02: 0
group_color: Filesystem_3 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_101 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_101 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_101 allocation score on sapcl01: 100
native_color: LVM_2 allocation score on sapcl03: -1000000
native_color: LVM_2 allocation score on sapcl02: -1000000
native_color: LVM_2 allocation score on sapcl01: 0
native_color: Filesystem_3 allocation score on sapcl03: -1000000
native_color: Filesystem_3 allocation score on sapcl02: -1000000
native_color: Filesystem_3 allocation score on sapcl01: 0
group_color: app02 allocation score on sapcl03: 0
-group_color: app02 allocation score on sapcl02: 0
+group_color: app02 allocation score on sapcl02: 100
group_color: app02 allocation score on sapcl01: 0
group_color: IPaddr_192_168_1_102 allocation score on sapcl03: 0
group_color: IPaddr_192_168_1_102 allocation score on sapcl02: 100
group_color: IPaddr_192_168_1_102 allocation score on sapcl01: 0
group_color: LVM_12 allocation score on sapcl03: 0
group_color: LVM_12 allocation score on sapcl02: 0
group_color: LVM_12 allocation score on sapcl01: 0
group_color: Filesystem_13 allocation score on sapcl03: 0
group_color: Filesystem_13 allocation score on sapcl02: 0
group_color: Filesystem_13 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_102 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_102 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_102 allocation score on sapcl01: 0
native_color: LVM_12 allocation score on sapcl03: -1000000
native_color: LVM_12 allocation score on sapcl02: -1000000
native_color: LVM_12 allocation score on sapcl01: 0
native_color: Filesystem_13 allocation score on sapcl03: -1000000
native_color: Filesystem_13 allocation score on sapcl02: -1000000
native_color: Filesystem_13 allocation score on sapcl01: 0
-group_color: oracle allocation score on sapcl03: 0
+group_color: oracle allocation score on sapcl03: 100
group_color: oracle allocation score on sapcl02: 0
group_color: oracle allocation score on sapcl01: 0
group_color: IPaddr_192_168_1_104 allocation score on sapcl03: 100
group_color: IPaddr_192_168_1_104 allocation score on sapcl02: 0
group_color: IPaddr_192_168_1_104 allocation score on sapcl01: 0
group_color: LVM_22 allocation score on sapcl03: 0
group_color: LVM_22 allocation score on sapcl02: 0
group_color: LVM_22 allocation score on sapcl01: 0
group_color: Filesystem_23 allocation score on sapcl03: 0
group_color: Filesystem_23 allocation score on sapcl02: 0
group_color: Filesystem_23 allocation score on sapcl01: 0
group_color: oracle_24 allocation score on sapcl03: 0
group_color: oracle_24 allocation score on sapcl02: 0
group_color: oracle_24 allocation score on sapcl01: 0
group_color: oralsnr_25 allocation score on sapcl03: 0
group_color: oralsnr_25 allocation score on sapcl02: 0
group_color: oralsnr_25 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_104 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_104 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_104 allocation score on sapcl01: 0
native_color: LVM_22 allocation score on sapcl03: -1000000
native_color: LVM_22 allocation score on sapcl02: -1000000
native_color: LVM_22 allocation score on sapcl01: 0
native_color: Filesystem_23 allocation score on sapcl03: -1000000
native_color: Filesystem_23 allocation score on sapcl02: -1000000
native_color: Filesystem_23 allocation score on sapcl01: 0
native_color: oracle_24 allocation score on sapcl03: -1000000
native_color: oracle_24 allocation score on sapcl02: -1000000
native_color: oracle_24 allocation score on sapcl01: 0
native_color: oralsnr_25 allocation score on sapcl03: -1000000
native_color: oralsnr_25 allocation score on sapcl02: -1000000
native_color: oralsnr_25 allocation score on sapcl01: 0
diff --git a/pengine/test10/standby.scores b/pengine/test10/standby.scores
index 556a93e1e4..5981107ca5 100644
--- a/pengine/test10/standby.scores
+++ b/pengine/test10/standby.scores
@@ -1,76 +1,76 @@
Allocation scores:
group_color: app01 allocation score on sapcl03: 0
group_color: app01 allocation score on sapcl02: 0
-group_color: app01 allocation score on sapcl01: 0
+group_color: app01 allocation score on sapcl01: 100
group_color: IPaddr_192_168_1_101 allocation score on sapcl03: 0
group_color: IPaddr_192_168_1_101 allocation score on sapcl02: 0
group_color: IPaddr_192_168_1_101 allocation score on sapcl01: 100
group_color: LVM_2 allocation score on sapcl03: 0
group_color: LVM_2 allocation score on sapcl02: 0
group_color: LVM_2 allocation score on sapcl01: 0
group_color: Filesystem_3 allocation score on sapcl03: 0
group_color: Filesystem_3 allocation score on sapcl02: 0
group_color: Filesystem_3 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_101 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_101 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_101 allocation score on sapcl01: 100
native_color: LVM_2 allocation score on sapcl03: -1000000
native_color: LVM_2 allocation score on sapcl02: -1000000
native_color: LVM_2 allocation score on sapcl01: 0
native_color: Filesystem_3 allocation score on sapcl03: -1000000
native_color: Filesystem_3 allocation score on sapcl02: -1000000
native_color: Filesystem_3 allocation score on sapcl01: 0
group_color: app02 allocation score on sapcl03: 0
-group_color: app02 allocation score on sapcl02: 0
+group_color: app02 allocation score on sapcl02: 100
group_color: app02 allocation score on sapcl01: 0
group_color: IPaddr_192_168_1_102 allocation score on sapcl03: 0
group_color: IPaddr_192_168_1_102 allocation score on sapcl02: 100
group_color: IPaddr_192_168_1_102 allocation score on sapcl01: 0
group_color: LVM_12 allocation score on sapcl03: 0
group_color: LVM_12 allocation score on sapcl02: 0
group_color: LVM_12 allocation score on sapcl01: 0
group_color: Filesystem_13 allocation score on sapcl03: 0
group_color: Filesystem_13 allocation score on sapcl02: 0
group_color: Filesystem_13 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_102 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_102 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_102 allocation score on sapcl01: 0
native_color: LVM_12 allocation score on sapcl03: -1000000
native_color: LVM_12 allocation score on sapcl02: -1000000
native_color: LVM_12 allocation score on sapcl01: 0
native_color: Filesystem_13 allocation score on sapcl03: -1000000
native_color: Filesystem_13 allocation score on sapcl02: -1000000
native_color: Filesystem_13 allocation score on sapcl01: 0
-group_color: oracle allocation score on sapcl03: 0
+group_color: oracle allocation score on sapcl03: 100
group_color: oracle allocation score on sapcl02: 0
group_color: oracle allocation score on sapcl01: 0
group_color: IPaddr_192_168_1_104 allocation score on sapcl03: 100
group_color: IPaddr_192_168_1_104 allocation score on sapcl02: 0
group_color: IPaddr_192_168_1_104 allocation score on sapcl01: 0
group_color: LVM_22 allocation score on sapcl03: 0
group_color: LVM_22 allocation score on sapcl02: 0
group_color: LVM_22 allocation score on sapcl01: 0
group_color: Filesystem_23 allocation score on sapcl03: 0
group_color: Filesystem_23 allocation score on sapcl02: 0
group_color: Filesystem_23 allocation score on sapcl01: 0
group_color: oracle_24 allocation score on sapcl03: 0
group_color: oracle_24 allocation score on sapcl02: 0
group_color: oracle_24 allocation score on sapcl01: 0
group_color: oralsnr_25 allocation score on sapcl03: 0
group_color: oralsnr_25 allocation score on sapcl02: 0
group_color: oralsnr_25 allocation score on sapcl01: 0
native_color: IPaddr_192_168_1_104 allocation score on sapcl03: -1000000
native_color: IPaddr_192_168_1_104 allocation score on sapcl02: -1000000
native_color: IPaddr_192_168_1_104 allocation score on sapcl01: 0
native_color: LVM_22 allocation score on sapcl03: -1000000
native_color: LVM_22 allocation score on sapcl02: -1000000
native_color: LVM_22 allocation score on sapcl01: 0
native_color: Filesystem_23 allocation score on sapcl03: -1000000
native_color: Filesystem_23 allocation score on sapcl02: -1000000
native_color: Filesystem_23 allocation score on sapcl01: 0
native_color: oracle_24 allocation score on sapcl03: -1000000
native_color: oracle_24 allocation score on sapcl02: -1000000
native_color: oracle_24 allocation score on sapcl01: 0
native_color: oralsnr_25 allocation score on sapcl03: -1000000
native_color: oralsnr_25 allocation score on sapcl02: -1000000
native_color: oralsnr_25 allocation score on sapcl01: 0