diff --git a/include/crm/msg_xml.h b/include/crm/msg_xml.h
index 4c1c44cb97..df5f42d55a 100644
--- a/include/crm/msg_xml.h
+++ b/include/crm/msg_xml.h
@@ -1,273 +1,274 @@
 /* 
  * 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
  */
 #ifndef XML_TAGS__H
 #define XML_TAGS__H
 
 #define CIB_OPTIONS_FIRST "cib-bootstrap-options"
 
 #define F_CRM_DATA			"crm_xml"
 #define F_CRM_TASK			"crm_task"
 #define F_CRM_HOST_TO			"crm_host_to"
 #define F_CRM_MSG_TYPE			F_SUBTYPE
 #define F_CRM_SYS_TO			"crm_sys_to"
 #define F_CRM_SYS_FROM			"crm_sys_from"
 #define F_CRM_HOST_FROM			F_ORIG
 #define F_CRM_REFERENCE			XML_ATTR_REFERENCE
 #define F_CRM_VERSION			XML_ATTR_VERSION
 #define F_CRM_ORIGIN			"origin"
 #define F_CRM_JOIN_ID			"join_id"
 #define F_CRM_ELECTION_ID		"election-id"
 #define F_CRM_ELECTION_OWNER		"election-owner"
 #define F_CRM_TGRAPH			"crm-tgraph"
 #define F_CRM_TGRAPH_INPUT		"crm-tgraph-in"
 
 /*---- Common tags/attrs */
 #define XML_DIFF_MARKER			"__crm_diff_marker__"
 #define XML_ATTR_TAGNAME		F_XML_TAGNAME
 #define XML_TAG_CIB			"cib"
 #define XML_TAG_FAILED			"failed"
 
 #define XML_ATTR_CRM_VERSION		"crm_feature_set"
 #define XML_ATTR_DIGEST			"digest"
 #define XML_ATTR_VALIDATION		"validate-with"
 
 #define XML_ATTR_QUORUM_PANIC		"no-quorum-panic"
 #define XML_ATTR_HAVE_QUORUM		"have-quorum"
 #define XML_ATTR_EXPECTED_VOTES		"expected-quorum-votes"
 #define XML_ATTR_GENERATION		"epoch"
 #define XML_ATTR_GENERATION_ADMIN	"admin_epoch"
 #define XML_ATTR_NUMUPDATES		"num_updates"
 #define XML_ATTR_TIMEOUT		"timeout"
 #define XML_ATTR_ORIGIN			"crm-debug-origin"
 #define XML_ATTR_TSTAMP			"crm-timestamp"
 #define XML_CIB_ATTR_WRITTEN		"cib-last-written"
 #define XML_ATTR_VERSION		"version"
 #define XML_ATTR_DESC			"description"
 #define XML_ATTR_ID			"id"
 #define XML_ATTR_IDREF			"id-ref"
 #define XML_ATTR_ID_LONG		"long-id"
 #define XML_ATTR_TYPE			"type"
 #define XML_ATTR_FILTER_TYPE		"type-filter"
 #define XML_ATTR_FILTER_ID		"id-filter"
 #define XML_ATTR_FILTER_PRIORITY	"priority-filter"
 #define XML_ATTR_VERBOSE		"verbose"
 #define XML_ATTR_OP			"op"
 #define XML_ATTR_DC			"is_dc"
 #define XML_ATTR_DC_UUID		"dc-uuid"
 
 #define XML_BOOLEAN_TRUE		"true"
 #define XML_BOOLEAN_FALSE		"false"
 #define XML_BOOLEAN_YES			XML_BOOLEAN_TRUE
 #define XML_BOOLEAN_NO			XML_BOOLEAN_FALSE
 
 #define XML_TAG_OPTIONS			"options"
 
 /*---- top level tags/attrs */
 #define XML_MSG_TAG			"crm_message"
 #define XML_MSG_TAG_DATA		"msg_data"
 #define XML_ATTR_REQUEST		"request"
 #define XML_ATTR_RESPONSE		"response"
 
 #define XML_ATTR_UNAME			"uname"
 #define XML_ATTR_UUID			"id"
 #define XML_ATTR_REFERENCE		"reference"
 
 #define XML_FAIL_TAG_RESOURCE		"failed_resource"
 
 #define XML_FAILRES_ATTR_RESID		"resource_id"
 #define XML_FAILRES_ATTR_REASON		"reason"
 #define XML_FAILRES_ATTR_RESSTATUS	"resource_status"
 
 #define XML_CRM_TAG_PING		"ping_response"
 #define XML_PING_ATTR_STATUS		"result"
 #define XML_PING_ATTR_SYSFROM		"crm_subsystem"
 
 #define XML_TAG_FRAGMENT		"cib_fragment"
 #define XML_ATTR_RESULT			"result"
 #define XML_ATTR_SECTION		"section"
 
 #define XML_FAIL_TAG_CIB		"failed_update"
 
 #define XML_FAILCIB_ATTR_ID		"id"
 #define XML_FAILCIB_ATTR_OBJTYPE	"object_type"
 #define XML_FAILCIB_ATTR_OP		"operation"
 #define XML_FAILCIB_ATTR_REASON		"reason"
 
 /*---- CIB specific tags/attrs */
 #define XML_CIB_TAG_SECTION_ALL		"all"
 #define XML_CIB_TAG_CONFIGURATION	"configuration"
 #define XML_CIB_TAG_STATUS       	"status"
 #define XML_CIB_TAG_RESOURCES		"resources"
 #define XML_CIB_TAG_NODES         	"nodes"
 #define XML_CIB_TAG_CONSTRAINTS   	"constraints"
 #define XML_CIB_TAG_CRMCONFIG   	"crm_config"
 #define XML_CIB_TAG_OPCONFIG		"op_defaults"
 #define XML_CIB_TAG_RSCCONFIG   	"rsc_defaults"
 
 #define XML_CIB_TAG_STATE         	"node_state"
 #define XML_CIB_TAG_NODE          	"node"
 #define XML_CIB_TAG_CONSTRAINT    	"constraint"
 #define XML_CIB_TAG_NVPAIR        	"nvpair"
 
 #define XML_CIB_TAG_PROPSET	   	"cluster_property_set"
 #define XML_TAG_ATTR_SETS	   	"instance_attributes"
 #define XML_TAG_META_SETS	   	"meta_attributes"
 #define XML_TAG_ATTRS			"attributes"
 #define XML_TAG_PARAMS			"parameters"
 #define XML_TAG_PARAM			"param"
 #define XML_TAG_UTILIZATION		"utilization"
 
 #define XML_TAG_RESOURCE_REF		"resource_ref"
 #define XML_CIB_TAG_RESOURCE	  	"primitive"
 #define XML_CIB_TAG_GROUP	  	"group"
 #define XML_CIB_TAG_INCARNATION		"clone"
 #define XML_CIB_TAG_MASTER		"master"
 
 #define XML_RSC_ATTR_RESTART	  	"restart-type"
 #define XML_RSC_ATTR_ORDERED		"ordered"
 #define XML_RSC_ATTR_INTERLEAVE		"interleave"
 #define XML_RSC_ATTR_INCARNATION	"clone"
 #define XML_RSC_ATTR_INCARNATION_MAX	"clone-max"
 #define XML_RSC_ATTR_INCARNATION_NODEMAX	"clone-node-max"
 #define XML_RSC_ATTR_MASTER_MAX		"master-max"
 #define XML_RSC_ATTR_MASTER_NODEMAX	"master-node-max"
 #define XML_RSC_ATTR_STATE		"clone-state"
 #define XML_RSC_ATTR_MANAGED		"is-managed"
 #define XML_RSC_ATTR_TARGET_ROLE	"target-role"
 #define XML_RSC_ATTR_UNIQUE		"globally-unique"
 #define XML_RSC_ATTR_NOTIFY		"notify"
 #define XML_RSC_ATTR_STICKINESS		"resource-stickiness"
 #define XML_RSC_ATTR_FAIL_STICKINESS	"migration-threshold"
 #define XML_RSC_ATTR_FAIL_TIMEOUT	"failure-timeout"
 #define XML_RSC_ATTR_MULTIPLE		"multiple-active"
 #define XML_RSC_ATTR_PRIORITY		"priority"
 #define XML_OP_ATTR_ON_FAIL		"on-fail"
 #define XML_OP_ATTR_START_DELAY		"start-delay"
 #define XML_OP_ATTR_ALLOW_MIGRATE	"allow-migrate"
 #define XML_OP_ATTR_ORIGIN		"interval-origin"
 #define XML_OP_ATTR_PENDING		"record-pending"
 
 #define XML_CIB_TAG_LRM		  	"lrm"
 #define XML_LRM_TAG_RESOURCES     	"lrm_resources"
 #define XML_LRM_TAG_RESOURCE     	"lrm_resource"
 #define XML_LRM_TAG_AGENTS	     	"lrm_agents"
 #define XML_LRM_TAG_AGENT		"lrm_agent"
 #define XML_LRM_TAG_RSC_OP		"lrm_rsc_op"
 #define XML_AGENT_ATTR_CLASS		"class"
 #define XML_AGENT_ATTR_PROVIDER		"provider"
 #define XML_LRM_TAG_ATTRIBUTES		"attributes"
 
 #define XML_CIB_ATTR_REPLACE       	"replace"
 #define XML_CIB_ATTR_SOURCE       	"source"
 
 #define XML_CIB_ATTR_HEALTH       	"health"
 #define XML_CIB_ATTR_WEIGHT       	"weight"
 #define XML_CIB_ATTR_PRIORITY     	"priority"
 #define XML_CIB_ATTR_CLEAR        	"clear_on"
 #define XML_CIB_ATTR_SOURCE       	"source"
 
 #define XML_CIB_ATTR_JOINSTATE    	"join"
 #define XML_CIB_ATTR_EXPSTATE     	"expected"
 #define XML_CIB_ATTR_INCCM        	"in_ccm"
 #define XML_CIB_ATTR_CRMDSTATE    	"crmd"
 #define XML_CIB_ATTR_HASTATE    	"ha"
 
 #define XML_CIB_ATTR_SHUTDOWN       	"shutdown"
 #define XML_CIB_ATTR_STONITH	    	"stonith"
 
 #define XML_LRM_ATTR_INTERVAL		"interval"
 #define XML_LRM_ATTR_TASK		"operation"
 #define XML_LRM_ATTR_TASK_KEY		"operation_key"
 #define XML_LRM_ATTR_TARGET		"on_node"
 #define XML_LRM_ATTR_TARGET_UUID	"on_node_uuid"
 #define XML_LRM_ATTR_RSCID		"rsc-id"
 #define XML_LRM_ATTR_OPSTATUS		"op-status"
 #define XML_LRM_ATTR_RC			"rc-code"
 #define XML_LRM_ATTR_CALLID		"call-id"
 #define XML_LRM_ATTR_OP_DIGEST		"op-digest"
 #define XML_LRM_ATTR_OP_RESTART		"op-force-restart"
 #define XML_LRM_ATTR_RESTART_DIGEST	"op-restart-digest"
 
 #define XML_TAG_GRAPH			"transition_graph"
 #define XML_GRAPH_TAG_RSC_OP		"rsc_op"
 #define XML_GRAPH_TAG_PSEUDO_EVENT	"pseudo_event"
 #define XML_GRAPH_TAG_CRM_EVENT		"crm_event"
 
 #define XML_TAG_RULE			"rule"
 #define XML_RULE_ATTR_SCORE		"score"
 #define XML_RULE_ATTR_SCORE_ATTRIBUTE	"score-attribute"
 #define XML_RULE_ATTR_SCORE_MANGLED	"score-attribute-mangled"
 #define XML_RULE_ATTR_ROLE		"role"
 #define XML_RULE_ATTR_RESULT		"result"
 #define XML_RULE_ATTR_BOOLEAN_OP	"boolean-op"
 
 #define XML_TAG_EXPRESSION		"expression"
 #define XML_EXPR_ATTR_ATTRIBUTE		"attribute"
 #define XML_EXPR_ATTR_OPERATION		"operation"
 #define XML_EXPR_ATTR_VALUE		"value"
 #define XML_EXPR_ATTR_TYPE		"type"
 
 #define XML_CONS_TAG_RSC_DEPEND		"rsc_colocation"
 #define XML_CONS_TAG_RSC_ORDER		"rsc_order"
 #define XML_CONS_TAG_RSC_LOCATION	"rsc_location"
+#define XML_CONS_TAG_RSC_SET		"resource_set"
 #define XML_CONS_ATTR_SYMMETRICAL	"symmetrical"
 
 #define XML_COLOC_ATTR_SOURCE		"rsc"
 #define XML_COLOC_ATTR_SOURCE_ROLE	"rsc-role"
 #define XML_COLOC_ATTR_TARGET		"with-rsc"
 #define XML_COLOC_ATTR_TARGET_ROLE	"with-rsc-role"
 #define XML_COLOC_ATTR_NODE_ATTR	"node-attribute"
 
 #define XML_ORDER_ATTR_FIRST		"first"
 #define XML_ORDER_ATTR_THEN		"then"
 #define XML_ORDER_ATTR_FIRST_ACTION	"first-action"
 #define XML_ORDER_ATTR_THEN_ACTION	"then-action"
 #define XML_ORDER_ATTR_KIND		"kind"
 
 #define XML_NVPAIR_ATTR_NAME        	"name"
 #define XML_NVPAIR_ATTR_VALUE        	"value"
 
 #define XML_NODE_ATTR_STATE		"state"
 
 #define XML_CONFIG_ATTR_DC_DEADTIME	"dc-deadtime"
 #define XML_CONFIG_ATTR_ELECTION_FAIL	"election-timeout"
 #define XML_CONFIG_ATTR_FORCE_QUIT	"shutdown-escalation"
 #define XML_CONFIG_ATTR_RECHECK		"cluster-recheck-interval"
 
 #define XML_CIB_TAG_GENERATION_TUPPLE	"generation_tuple"
 
 #define XML_ATTR_TRANSITION_MAGIC	"transition-magic"
 #define XML_ATTR_TRANSITION_KEY		"transition-key"
 
 #define XML_ATTR_TE_NOWAIT		"op_no_wait"
 #define XML_ATTR_TE_TARGET_RC		"op_target_rc"
 #define XML_ATTR_TE_ALLOWFAIL		"op_allow_fail"
 #define XML_ATTR_LRM_PROBE		"lrm-is-probe"
 #define XML_TAG_TRANSIENT_NODEATTRS	"transient_attributes"
 
 #define XML_TAG_DIFF_ADDED		"diff-added"
 #define XML_TAG_DIFF_REMOVED		"diff-removed"
 
 #include <crm/common/xml.h> 
 
 #define ID(x) crm_element_value(x, XML_ATTR_ID)
 #define INSTANCE(x) crm_element_value(x, XML_CIB_ATTR_INSTANCE)
 #define TSTAMP(x) crm_element_value(x, XML_ATTR_TSTAMP)
 #define TYPE(x) crm_element_name(x) 
 
 #endif
diff --git a/pengine/constraints.c b/pengine/constraints.c
index 2b71822968..d989c18560 100644
--- a/pengine/constraints.c
+++ b/pengine/constraints.c
@@ -1,1136 +1,1138 @@
 /* 
  * 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 <sys/param.h>
 
 #include <crm/crm.h>
 #include <crm/cib.h>
 #include <crm/msg_xml.h>
 #include <crm/common/xml.h>
 #include <crm/common/msg.h>
 
 
 #include <glib.h>
 
 #include <crm/pengine/status.h>
 #include <pengine.h>
 #include <allocate.h>
 #include <utils.h>
 #include <crm/pengine/rules.h>
 #include <lib/pengine/utils.h>
 
 enum pe_order_kind 
 {
     pe_order_kind_optional,
     pe_order_kind_mandatory,
     pe_order_kind_serialize,
 };
 
 enum pe_ordering get_flags(
     const char *id, enum pe_order_kind kind,
     const char *action_first, const char *action_then, gboolean invert);
 
 gboolean 
 unpack_constraints(xmlNode * xml_constraints, pe_working_set_t *data_set)
 {
 	xmlNode *lifetime = NULL;
 	xml_child_iter(
 		xml_constraints, xml_obj, 
 
 		const char *id = crm_element_value(xml_obj, XML_ATTR_ID);
 		if(id == NULL) {
 			crm_config_err("Constraint <%s...> must have an id",
 				crm_element_name(xml_obj));
 			continue;
 		}
 
 		crm_debug_3("Processing constraint %s %s",
 			    crm_element_name(xml_obj),id);
 
 		lifetime = first_named_child(xml_obj, "lifetime");
 
 		if(test_ruleset(lifetime, NULL, data_set->now) == FALSE) {
 			crm_info("Constraint %s %s is not active",
 				 crm_element_name(xml_obj), id);
 
 		} else if(safe_str_eq(XML_CONS_TAG_RSC_ORDER,
 				      crm_element_name(xml_obj))) {
 			unpack_rsc_order(xml_obj, data_set);
 
 		} else if(safe_str_eq(XML_CONS_TAG_RSC_DEPEND,
 				      crm_element_name(xml_obj))) {
 			unpack_rsc_colocation(xml_obj, data_set);
 
 		} else if(safe_str_eq(XML_CONS_TAG_RSC_LOCATION,
 				      crm_element_name(xml_obj))) {
 			unpack_rsc_location(xml_obj, data_set);
 
 		} else {
 			pe_err("Unsupported constraint type: %s",
 				crm_element_name(xml_obj));
 		}
 		);
 
 	return TRUE;
 }
 
 static const char *
 invert_action(const char *action) 
 {
 	if(safe_str_eq(action, RSC_START)) {
 		return RSC_STOP;
 
 	} else if(safe_str_eq(action, RSC_STOP)) {
 		return RSC_START;
 		
 	} else if(safe_str_eq(action, RSC_PROMOTE)) {
 		return RSC_DEMOTE;
 		
  	} else if(safe_str_eq(action, RSC_DEMOTE)) {
 		return RSC_PROMOTE;
 
 	} else if(safe_str_eq(action, RSC_PROMOTED)) {
 		return RSC_DEMOTED;
 		
 	} else if(safe_str_eq(action, RSC_DEMOTED)) {
 		return RSC_PROMOTED;
 
 	} else if(safe_str_eq(action, RSC_STARTED)) {
 		return RSC_STOPPED;
 		
 	} else if(safe_str_eq(action, RSC_STOPPED)) {
 		return RSC_STARTED;
 	}
 	crm_config_warn("Unknown action: %s", action);
 	return NULL;
 }
 
 static enum pe_order_kind get_ordering_type(xmlNode *xml_obj)
 {
     enum pe_order_kind kind_e = pe_order_kind_mandatory;
     const char *kind = crm_element_value(xml_obj, XML_ORDER_ATTR_KIND);
 
     if(kind == NULL) {
 	const char *score = crm_element_value(xml_obj, XML_RULE_ATTR_SCORE);
 	kind_e = pe_order_kind_mandatory;
 
 	if(score) {
 	    int score_i = char2score(score);
 	    if(score_i == 0) {
 		kind_e = pe_order_kind_optional;
 	    }
 
 	/* } else if(rsc_then->variant == pe_native && rsc_first->variant > pe_group) { */
 	/*     kind_e = pe_order_kind_optional; */
 	}
 	    
     } else if(safe_str_eq(kind, "Mandatory")) {
 	kind_e = pe_order_kind_mandatory;
 
     } else if(safe_str_eq(kind, "Optional")) {
 	kind_e = pe_order_kind_optional;
 
     } else if(safe_str_eq(kind, "Serialize")) {
 	kind_e = pe_order_kind_serialize;
 
     } else {
 	const char *id = crm_element_value(xml_obj, XML_ATTR_ID);
 	crm_config_err("Constraint %s: Unknown type '%s'", id, kind);
     }
     return kind_e;
 }
 
 static gboolean
 unpack_simple_rsc_order(xmlNode * xml_obj, pe_working_set_t *data_set)
 {
 	int order_id = 0;
 	resource_t *rsc_then = NULL;
 	resource_t *rsc_first = NULL;
 	gboolean invert_bool = TRUE;
 	enum pe_order_kind kind = pe_order_kind_mandatory;
 	enum pe_ordering cons_weight = pe_order_optional;
 
 	const char *id_first  = NULL;
 	const char *id_then  = NULL;
 	const char *action_then = NULL;
 	const char *action_first = NULL;
 	
 	const char *id     = crm_element_value(xml_obj, XML_ATTR_ID);
 	const char *invert = crm_element_value(xml_obj, XML_CONS_ATTR_SYMMETRICAL);
 
 	crm_str_to_boolean(invert, &invert_bool);
 	
 	if(xml_obj == NULL) {
 		crm_config_err("No constraint object to process.");
 		return FALSE;
 
 	} else if(id == NULL) {
 		crm_config_err("%s constraint must have an id",
 			crm_element_name(xml_obj));
 		return FALSE;		
 	}
 
 	id_then  = crm_element_value(xml_obj, XML_ORDER_ATTR_THEN);
 	id_first = crm_element_value(xml_obj, XML_ORDER_ATTR_FIRST);
 
 	action_then  = crm_element_value(xml_obj, XML_ORDER_ATTR_THEN_ACTION);
 	action_first = crm_element_value(xml_obj, XML_ORDER_ATTR_FIRST_ACTION);
 
 	if(action_first == NULL) {
 	    action_first = RSC_START;
 	}
 	if(action_then == NULL) {
 	    action_then = action_first;
 	}
 
 	if(id_then == NULL || id_first == NULL) {
 		crm_config_err("Constraint %s needs two sides lh: %s rh: %s",
 			      id, crm_str(id_then), crm_str(id_first));
 		return FALSE;
 	}	
 
 	rsc_then = pe_find_resource(data_set->resources, id_then);
 	rsc_first = pe_find_resource(data_set->resources, id_first);
 
 	if(rsc_then == NULL) {
 		crm_config_err("Constraint %s: no resource found for name '%s'", id, id_then);
 		return FALSE;
 	
 	} else if(rsc_first == NULL) {
 		crm_config_err("Constraint %s: no resource found for name '%s'", id, id_first);
 		return FALSE;
 	}
 
 	cons_weight = pe_order_optional;
 	kind = get_ordering_type(xml_obj);
 	
 	if(kind == pe_order_kind_optional && rsc_then->restart_type == pe_restart_restart) {
 	    crm_debug_2("Upgrade : recovery - implies right");
 	    cons_weight |= pe_order_implies_right;
 	}
 
 	cons_weight |= get_flags(id, kind, action_first, action_then, FALSE);
 	order_id = new_rsc_order(
 	    rsc_first, action_first, rsc_then, action_then, cons_weight, data_set);
 
 	crm_debug_2("order-%d (%s): %s_%s before %s_%s flags=0x%.6x",
 		    order_id, id, rsc_first->id, action_first, rsc_then->id, action_then,
 		    cons_weight);
 	
 	
 	if(invert_bool == FALSE) {
 		return TRUE;
 
 	} else if(invert && kind == pe_order_kind_serialize) {
 	    crm_config_warn("Cannot invert serialized constraint set %s", id);
 	    return TRUE;
 
 	} else if(kind == pe_order_kind_serialize) {
 	    return TRUE;
 	}
 	
 	action_then = invert_action(action_then);
 	action_first = invert_action(action_first);
 	if(action_then == NULL || action_first == NULL) {
 		crm_config_err("Cannot invert rsc_order constraint %s."
 			       " Please specify the inverse manually.", id);
 		return TRUE;
 	}
 
 	cons_weight = pe_order_optional;
 	if(kind == pe_order_kind_optional && rsc_then->restart_type == pe_restart_restart) {
 	    crm_debug_2("Upgrade : recovery - implies left");
 	    cons_weight |= pe_order_implies_left;
 	}
 
 	cons_weight |= get_flags(id, kind, action_first, action_then, TRUE);
 	order_id = new_rsc_order(
 	    rsc_then, action_then, rsc_first, action_first, cons_weight, data_set);
 
 	crm_debug_2("order-%d (%s): %s_%s before %s_%s flags=0x%.6x",
 		    order_id, id, rsc_then->id, action_then, rsc_first->id, action_first,
 		    cons_weight);
 	
 	return TRUE;
 }
 
 gboolean
 unpack_rsc_location(xmlNode * xml_obj, pe_working_set_t *data_set)
 {
 	gboolean empty = TRUE;
 	const char *id_lh   = crm_element_value(xml_obj, "rsc");
 	const char *id      = crm_element_value(xml_obj, XML_ATTR_ID);
 	resource_t *rsc_lh  = pe_find_resource(data_set->resources, id_lh);
 	const char *node    = crm_element_value(xml_obj, "node");
 	const char *score   = crm_element_value(xml_obj, XML_RULE_ATTR_SCORE);
 	
 	if(rsc_lh == NULL) {
 		/* only a warn as BSC adds the constraint then the resource */
 		crm_config_warn("No resource (con=%s, rsc=%s)", id, id_lh);
 		return FALSE;
 	}
 
 	if(node != NULL && score != NULL) {
 	    int score_i = char2score(score);
 	    node_t *match = pe_find_node(data_set->nodes, node);
 
 	    if(match) {
 		rsc2node_new(id, rsc_lh, score_i, match, data_set);
 		return TRUE;
 	    } else {
 		return FALSE;
 	    }
 	}
 	
 	xml_child_iter_filter(
 		xml_obj, rule_xml, XML_TAG_RULE,
 		empty = FALSE;
 		crm_debug_2("Unpacking %s/%s", id, ID(rule_xml));
 		generate_location_rule(rsc_lh, rule_xml, data_set);
 		);
 
 	if(empty) {
 		crm_config_err("Invalid location constraint %s:"
 			      " rsc_location must contain at least one rule",
 			      ID(xml_obj));
 	}
 	return TRUE;
 }
 
 static int
 get_node_score(const char *rule, const char *score, gboolean raw, node_t *node)
 {
 	int score_f = 0;
 	if(score == NULL) {
 		pe_err("Rule %s: no score specified.  Assuming 0.", rule);
 	
 	} else if(raw) {
 		score_f = char2score(score);
 	
 	} else {
 		const char *attr_score = g_hash_table_lookup(
 			node->details->attrs, score);
 		if(attr_score == NULL) {
 			crm_debug("Rule %s: node %s did not have a value for %s",
 				  rule, node->details->uname, score);
 			score_f = -INFINITY;
 			
 		} else {
 			crm_debug("Rule %s: node %s had value %s for %s",
 				  rule, node->details->uname, attr_score, score);
 			score_f = char2score(attr_score);
 		}
 	}
 	return score_f;
 }
 
 
 rsc_to_node_t *
 generate_location_rule(
 	resource_t *rsc, xmlNode *rule_xml, pe_working_set_t *data_set)
 {	
 	const char *rule_id = NULL;
 	const char *score   = NULL;
 	const char *boolean = NULL;
 	const char *role    = NULL;
 
 	GListPtr match_L  = NULL;
 	
 	int score_f   = 0;
 	gboolean do_and = TRUE;
 	gboolean accept = TRUE;
 	gboolean raw_score = TRUE;
 	
 	rsc_to_node_t *location_rule = NULL;
 	
 	rule_xml = expand_idref(rule_xml, data_set->input);
 	rule_id = crm_element_value(rule_xml, XML_ATTR_ID);
 	boolean = crm_element_value(rule_xml, XML_RULE_ATTR_BOOLEAN_OP);
 	role = crm_element_value(rule_xml, XML_RULE_ATTR_ROLE);
 
 	crm_debug_2("Processing rule: %s", rule_id);
 
 	if(role != NULL && text2role(role) == RSC_ROLE_UNKNOWN) {
 		pe_err("Bad role specified for %s: %s", rule_id, role);
 		return NULL;
 	}
 	
 	score = crm_element_value(rule_xml, XML_RULE_ATTR_SCORE);
 	if(score != NULL) {
 		score_f = char2score(score);
 		
 	} else {
 		score = crm_element_value(
 			rule_xml, XML_RULE_ATTR_SCORE_ATTRIBUTE);
 		if(score == NULL) {
 			score = crm_element_value(
 				rule_xml, XML_RULE_ATTR_SCORE_MANGLED);
 		}
 		if(score != NULL) {
 			raw_score = FALSE;
 		}
 	}
 	if(safe_str_eq(boolean, "or")) {
 		do_and = FALSE;
 	}
 	
 	location_rule = rsc2node_new(rule_id, rsc, 0, NULL, data_set);
 	
 	if(location_rule == NULL) {
 		return NULL;
 	}
 	if(role != NULL) {
 		crm_debug_2("Setting role filter: %s", role);
 		location_rule->role_filter = text2role(role);
 		if(location_rule->role_filter == RSC_ROLE_SLAVE) {
 		    /* Fold slave back into Started for simplicity
 		     * At the point Slave location constraints are evaluated,
 		     * all resources are still either stopped or started
 		     */  
 		    location_rule->role_filter = RSC_ROLE_STARTED;
 		}
 	}
 	if(do_and) {
 		match_L = node_list_dup(data_set->nodes, TRUE, FALSE);
 		slist_iter(
 			node, node_t, match_L, lpc,
 			node->weight = get_node_score(rule_id, score, raw_score, node);
 			);
 	}
 
 	slist_iter(
 	    node, node_t, data_set->nodes, lpc,
 
 			accept = test_rule(
 			    rule_xml, node->details->attrs, RSC_ROLE_UNKNOWN, data_set->now);
 
 			crm_debug_2("Rule %s %s on %s", ID(rule_xml), accept?"passed":"failed", node->details->uname);
 
 			score_f = get_node_score(rule_id, score, raw_score, node);
 /* 			if(accept && score_f == -INFINITY) { */
 /* 				accept = FALSE; */
 /* 			} */
 			
 			if(accept) {
 				node_t *local = pe_find_node_id(
 					match_L, node->details->id);
 				if(local == NULL && do_and) {
 					continue;
 					
 				} else if(local == NULL) {
 					local = node_copy(node);
 					match_L = g_list_append(match_L, local);
 				}
 
 				if(do_and == FALSE) {
 					local->weight = merge_weights(
 						local->weight, score_f);
 				}
 				crm_debug_2("node %s now has weight %d",
 					    node->details->uname, local->weight);
 				
 			} else if(do_and && !accept) {
 				/* remove it */
 				node_t *delete = pe_find_node_id(
 					match_L, node->details->id);
 				if(delete != NULL) {
 					match_L = g_list_remove(match_L,delete);
 					crm_debug_5("node %s did not match",
 						    node->details->uname);
 				}
 				crm_free(delete);
 			}
 		);
 	
 	location_rule->node_list_rh = match_L;
 	if(location_rule->node_list_rh == NULL) {
 		crm_debug_2("No matching nodes for rule %s", rule_id);
 		return NULL;
 	} 
 
 	crm_debug_3("%s: %d nodes matched",
 		    rule_id, g_list_length(location_rule->node_list_rh));
 	return location_rule;
 }
 
 static gint sort_cons_priority_lh(gconstpointer a, gconstpointer b)
 {
 	const rsc_colocation_t *rsc_constraint1 = (const rsc_colocation_t*)a;
 	const rsc_colocation_t *rsc_constraint2 = (const rsc_colocation_t*)b;
 
 	if(a == NULL) { return 1; }
 	if(b == NULL) { return -1; }
 
 	CRM_ASSERT(rsc_constraint1->rsc_lh != NULL);
 	CRM_ASSERT(rsc_constraint1->rsc_rh != NULL);
 	
 	if(rsc_constraint1->rsc_lh->priority > rsc_constraint2->rsc_lh->priority) {
 	    return -1;
 	}
 	
 	if(rsc_constraint1->rsc_lh->priority < rsc_constraint2->rsc_lh->priority) {
 	    return 1;
 	}
 
 	return strcmp(rsc_constraint1->rsc_lh->id, rsc_constraint2->rsc_lh->id);
 }
 
 static gint sort_cons_priority_rh(gconstpointer a, gconstpointer b)
 {
 	const rsc_colocation_t *rsc_constraint1 = (const rsc_colocation_t*)a;
 	const rsc_colocation_t *rsc_constraint2 = (const rsc_colocation_t*)b;
 
 	if(a == NULL) { return 1; }
 	if(b == NULL) { return -1; }
 
 	CRM_ASSERT(rsc_constraint1->rsc_lh != NULL);
 	CRM_ASSERT(rsc_constraint1->rsc_rh != NULL);
 	
 	if(rsc_constraint1->rsc_rh->priority > rsc_constraint2->rsc_rh->priority) {
 	    return -1;
 	}
 	
 	if(rsc_constraint1->rsc_rh->priority < rsc_constraint2->rsc_rh->priority) {
 	    return 1;
 	}
 	return strcmp(rsc_constraint1->rsc_rh->id, rsc_constraint2->rsc_rh->id);
 }
 
 gboolean
 rsc_colocation_new(const char *id, const char *node_attr, int score,
 		   resource_t *rsc_lh, resource_t *rsc_rh,
 		   const char *state_lh, const char *state_rh,
 		   pe_working_set_t *data_set)
 {
 	rsc_colocation_t *new_con      = NULL;
 	if(rsc_lh == NULL){
 		crm_config_err("No resource found for LHS %s", id);
 		return FALSE;
 
 	} else if(rsc_rh == NULL){
 		crm_config_err("No resource found for RHS of %s", id);
 		return FALSE;
 	}
 
 	crm_malloc0(new_con, sizeof(rsc_colocation_t));
 	if(new_con == NULL) {
 		return FALSE;
 	}
 
 	if(state_lh == NULL
 	   || safe_str_eq(state_lh, RSC_ROLE_STARTED_S)) {
 		state_lh = RSC_ROLE_UNKNOWN_S;
 	}
 
 	if(state_rh == NULL
 	   || safe_str_eq(state_rh, RSC_ROLE_STARTED_S)) {
 		state_rh = RSC_ROLE_UNKNOWN_S;
 	} 
 
 	new_con->id       = id;
 	new_con->rsc_lh   = rsc_lh;
 	new_con->rsc_rh   = rsc_rh;
 	new_con->score   = score;
 	new_con->role_lh = text2role(state_lh);
 	new_con->role_rh = text2role(state_rh);
 	new_con->node_attribute = node_attr;
 
 	if(node_attr == NULL) {
 	    node_attr = "#"XML_ATTR_UNAME;
 	}
 	
 	crm_debug_3("%s ==> %s (%s %d)", rsc_lh->id, rsc_rh->id, node_attr, score);
 	
 	rsc_lh->rsc_cons = g_list_insert_sorted(
 		rsc_lh->rsc_cons, new_con, sort_cons_priority_rh);
 
 	rsc_rh->rsc_cons_lhs = g_list_insert_sorted(
 		rsc_rh->rsc_cons_lhs, new_con, sort_cons_priority_lh);
 
 	data_set->colocation_constraints = g_list_append(
 		data_set->colocation_constraints, new_con);
 	
 	return TRUE;
 }
 
 /* LHS before RHS */
 int
 new_rsc_order(resource_t *lh_rsc, const char *lh_task, 
 	      resource_t *rh_rsc, const char *rh_task, 
 	      enum pe_ordering type, pe_working_set_t *data_set)
 {
     char *lh_key = NULL;
     char *rh_key = NULL;
 
     CRM_CHECK(lh_rsc != NULL,  return -1);
     CRM_CHECK(lh_task != NULL, return -1);
     CRM_CHECK(rh_rsc != NULL,  return -1);
     CRM_CHECK(rh_task != NULL, return -1);
     
     lh_key = generate_op_key(lh_rsc->id, lh_task, 0);
     rh_key = generate_op_key(rh_rsc->id, rh_task, 0);
     
     return custom_action_order(lh_rsc, lh_key, NULL,
 			       rh_rsc, rh_key, NULL, type, data_set);
 }
 
 /* LHS before RHS */
 int
 custom_action_order(
 	resource_t *lh_rsc, char *lh_action_task, action_t *lh_action,
 	resource_t *rh_rsc, char *rh_action_task, action_t *rh_action,
 	enum pe_ordering type, pe_working_set_t *data_set)
 {
 	order_constraint_t *order = NULL;
 	if(lh_rsc == NULL && lh_action) {
 		lh_rsc = lh_action->rsc;
 	}
 	if(rh_rsc == NULL && rh_action) {
 		rh_rsc = rh_action->rsc;
 	}
 
 	if((lh_action == NULL && lh_rsc == NULL)
 	   || (rh_action == NULL && rh_rsc == NULL)){
 		crm_config_err("Invalid inputs %p.%p %p.%p",
 			      lh_rsc, lh_action, rh_rsc, rh_action);
 		crm_free(lh_action_task);
 		crm_free(rh_action_task);
 		return -1;
 	}
 	
 	crm_malloc0(order, sizeof(order_constraint_t));
 
 	crm_debug_3("Creating ordering constraint %d",
 		    data_set->order_id);
 	
 	order->id             = data_set->order_id++;
 	order->type           = type;
 	order->lh_rsc         = lh_rsc;
 	order->rh_rsc         = rh_rsc;
 	order->lh_action      = lh_action;
 	order->rh_action      = rh_action;
 	order->lh_action_task = lh_action_task;
 	order->rh_action_task = rh_action_task;
 	
 	data_set->ordering_constraints = g_list_append(
 		data_set->ordering_constraints, order);
 	
 	if(lh_rsc != NULL && rh_rsc != NULL) {
 		crm_debug_4("Created ordering constraint %d (%s):"
 			 " %s/%s before %s/%s",
 			 order->id, ordering_type2text(order->type),
 			 lh_rsc->id, lh_action_task,
 			 rh_rsc->id, rh_action_task);
 		
 	} else if(lh_rsc != NULL) {
 		crm_debug_4("Created ordering constraint %d (%s):"
 			 " %s/%s before action %d (%s)",
 			 order->id, ordering_type2text(order->type),
 			 lh_rsc->id, lh_action_task,
 			 rh_action->id, rh_action_task);
 		
 	} else if(rh_rsc != NULL) {
 		crm_debug_4("Created ordering constraint %d (%s):"
 			 " action %d (%s) before %s/%s",
 			 order->id, ordering_type2text(order->type),
 			 lh_action->id, lh_action_task,
 			 rh_rsc->id, rh_action_task);
 		
 	} else {
 		crm_debug_4("Created ordering constraint %d (%s):"
 			 " action %d (%s) before action %d (%s)",
 			 order->id, ordering_type2text(order->type),
 			 lh_action->id, lh_action_task,
 			 rh_action->id, rh_action_task);
 	}
 	
 	return order->id;
 }
 
 enum pe_ordering get_flags(
     const char *id, enum pe_order_kind kind,
     const char *action_first, const char *action_then, gboolean invert) {
     enum pe_ordering flags = pe_order_optional;
 
     if(invert && kind == pe_order_kind_mandatory) {
 	crm_debug_2("Upgrade %s: implies left", id);
 	flags |= pe_order_implies_left;
 	if(safe_str_eq(action_then, RSC_DEMOTE)) {
 	    crm_debug_2("Upgrade %s: demote", id);
 	    flags |= pe_order_demote;
 	}
 	
     } else if(kind == pe_order_kind_mandatory) {
 	crm_debug_2("Upgrade %s: implies right", id);
 	flags |= pe_order_implies_right;
 	if(safe_str_eq(action_first, RSC_START)
 	   || safe_str_eq(action_first, RSC_PROMOTE)) {
 	    crm_debug_2("Upgrade %s: runnable", id);
 	    flags |= pe_order_runnable_left;
 	}
 
     } else if(kind == pe_order_kind_serialize) {
 	flags |= pe_order_serialize_only;
     }
     
     return flags;
 }
 
 
 static gboolean
 unpack_order_set(xmlNode *set, enum pe_order_kind kind,
 		 action_t **begin, action_t **end, action_t **inv_begin, action_t **inv_end,
 		 const char *symmetrical, pe_working_set_t *data_set) 
 {
     GListPtr set_iter = NULL;
     GListPtr resources = NULL;
     
     resource_t *last = NULL;
     resource_t *resource = NULL;
 
     int local_kind = kind;
     gboolean sequential = FALSE;
     enum pe_ordering flags = pe_order_optional;
     
     char *key = NULL;
     const char *id = ID(set);
     const char *action = crm_element_value(set, "action");
     const char *sequential_s = crm_element_value(set, "sequential");
     const char *kind_s = crm_element_value(set, XML_ORDER_ATTR_KIND);
 
     char *pseudo_id = NULL;
     char *end_id    = NULL;
     char *begin_id  = NULL;
 
     if(action == NULL) {
 	action = RSC_START;
     }
     
     pseudo_id = crm_concat(id, action, '-');
     end_id    = crm_concat(pseudo_id, "end", '-');
     begin_id  = crm_concat(pseudo_id, "begin", '-');
 
     *end = get_pseudo_op(end_id, data_set);
     *begin = get_pseudo_op(begin_id, data_set);
     
     if(kind_s) {
 	local_kind = get_ordering_type(set);
     }
 
     sequential = crm_is_true(sequential_s);
     flags = get_flags(id, local_kind, action, action, FALSE);
 
     xml_child_iter_filter(
 	set, xml_rsc, XML_TAG_RESOURCE_REF,
 	
 	resource = pe_find_resource(data_set->resources, ID(xml_rsc));
 	resources = g_list_append(resources, resource);
 	);
 
     set_iter = resources;
     while(set_iter != NULL) {
 	resource = (resource_t *) set_iter->data;
 	set_iter = set_iter->next;
 
 	key = generate_op_key(resource->id, action, 0);
 
 	custom_action_order(NULL, NULL, *begin, resource, crm_strdup(key), NULL,
 			    flags|pe_order_implies_left_printed, data_set);
 	
 	custom_action_order(resource, crm_strdup(key), NULL, NULL, NULL, *end,
 			    flags|pe_order_implies_right_printed, data_set);
 	
 	if(local_kind == pe_order_kind_serialize) {
 	    /* Serialize before everything that comes after */
 	    slist_iter(
 		then_rsc, resource_t, set_iter, lpc,
 
 		char *then_key = generate_op_key(then_rsc->id, action, 0);
 		custom_action_order(resource, crm_strdup(key), NULL, then_rsc, then_key, NULL,
 				    flags, data_set);
 		);
 		
 	} else if(sequential) {
 	    if(last != NULL) {
 		new_rsc_order(last, action, resource, action, flags, data_set);
 	    }
 	    last = resource;
 	}
     }
     
     if(crm_is_true(symmetrical) == FALSE) {
 	goto done;
 
     } else if(symmetrical && local_kind == pe_order_kind_serialize) {
 	crm_config_warn("Cannot invert serialized constraint set %s", id);
 	goto done;
 
     } else if(local_kind == pe_order_kind_serialize) {
 	goto done;
     }
     
 
     last = NULL;
     action = invert_action(action);
     
     pseudo_id = crm_concat(id, action, '-');
     end_id    = crm_concat(pseudo_id, "end", '-');
     begin_id  = crm_concat(pseudo_id, "begin", '-');
 
     *inv_end = get_pseudo_op(end_id, data_set);
     *inv_begin = get_pseudo_op(begin_id, data_set);
 
     flags = get_flags(id, local_kind, action, action, TRUE);
 
     set_iter = resources;
     while(set_iter != NULL) {
 	resource = (resource_t *) set_iter->data;
 	set_iter = set_iter->next;
 
 	key = generate_op_key(resource->id, action, 0);
 
 	custom_action_order(NULL, NULL, *inv_begin, resource, crm_strdup(key), NULL,
 			    flags|pe_order_implies_left_printed, data_set);
 
 	custom_action_order(resource, crm_strdup(key), NULL, NULL, NULL, *inv_end,
 			    flags|pe_order_implies_right_printed, data_set);
 	
 	if(sequential) {
 	    if(last != NULL) {
 		new_rsc_order(resource, action, last, action, flags, data_set);
 	    }
 	    last = resource;
 	}
     }
 
   done:
     g_list_free(resources);
     crm_free(pseudo_id);
     return TRUE;
 }
 
 static gboolean order_rsc_sets(
     const char *id, xmlNode *set1, xmlNode *set2, enum pe_order_kind kind, pe_working_set_t *data_set) {
 		
     resource_t *rsc_1 = NULL;
     resource_t *rsc_2 = NULL;
 	    
     const char *action_1 = crm_element_value(set1, "action");
     const char *action_2 = crm_element_value(set2, "action");
 
     const char *sequential_1 = crm_element_value(set1, "sequential");
     const char *sequential_2 = crm_element_value(set2, "sequential");
 
     enum pe_ordering flags = get_flags(id, kind, action_1, action_2, FALSE);
 	    
     if(crm_is_true(sequential_1)) {
 	/* get the first one */
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    break;
 	    );
     }
 
     if(crm_is_true(sequential_2)) {
 	/* get the last one */
 	const char *rid = NULL;
 	xml_child_iter_filter(
 	    set2, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rid = ID(xml_rsc);
 	    );
 	rsc_2 = pe_find_resource(data_set->resources, rid);
     }
 
     if(rsc_1 != NULL && rsc_2 != NULL) {
 	new_rsc_order(rsc_1, action_1, rsc_2, action_2, flags, data_set);
 
     } else if(rsc_1 != NULL) {
 	xml_child_iter_filter(
 	    set2, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_2 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    new_rsc_order(rsc_1, action_1, rsc_2, action_2, flags, data_set);
 	    );
 
     } else if(rsc_2 != NULL) {
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    new_rsc_order(rsc_1, action_1, rsc_2, action_2, flags, data_set);
 	    );
 
     } else {
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 
 	    xml_child_iter_filter(
 		set2, xml_rsc_2, XML_TAG_RESOURCE_REF,
 		rsc_2 = pe_find_resource(data_set->resources, ID(xml_rsc_2));
 		new_rsc_order(rsc_1, action_1, rsc_2, action_2, flags, data_set);
 		);
 	    );
     }
     return TRUE;
 }
 
 gboolean
 unpack_rsc_order(xmlNode *xml_obj, pe_working_set_t *data_set)
 {
 	gboolean any_sets = FALSE;
 
 	action_t *set_end = NULL;
 	action_t *set_begin = NULL;
 
 	action_t *set_inv_end = NULL;
 	action_t *set_inv_begin = NULL;
 	
 	xmlNode *last = NULL;
 	action_t *last_end = NULL;
 	action_t *last_begin = NULL;
 	action_t *last_inv_end = NULL;
 	action_t *last_inv_begin = NULL;
 	
 	const char *id    = crm_element_value(xml_obj, XML_ATTR_ID);
 	const char *invert = crm_element_value(xml_obj, XML_CONS_ATTR_SYMMETRICAL);
 	enum pe_order_kind kind = get_ordering_type(xml_obj);
 
 	if(invert == NULL) {
 	    invert = "true";
 	}
 
 	xml_child_iter_filter(
-	    xml_obj, set, "resource_set",
+	    xml_obj, set, XML_CONS_TAG_RSC_SET,
 
 	    any_sets = TRUE;
+	    set = expand_idref(set, data_set->input);
 	    if(unpack_order_set(set, kind, &set_begin, &set_end,
 				&set_inv_begin, &set_inv_end, invert, data_set) == FALSE) {
 		return FALSE;
 
 	    } else if(last) {
 		const char *set_action = crm_element_value(set, "action");
 		const char *last_action = crm_element_value(last, "action");
 		enum pe_ordering flags = get_flags(id, kind, last_action, set_action, FALSE);
 		order_actions(last_end, set_begin, flags);
 
 		if(crm_is_true(invert)) {
 		    set_action = invert_action(set_action?set_action:RSC_START);
 		    last_action = invert_action(last_action?last_action:RSC_START);
 		    
 		    flags = get_flags(id, kind, last_action, set_action, TRUE);
 		    order_actions(last_inv_begin, set_inv_end, flags);
 		}
 		
 	    } else if(/* never called */last && order_rsc_sets(id, last, set, kind, data_set) == FALSE) {
 		return FALSE;
 
 	    }
 	    last = set;
 	    last_end = set_end;
 	    last_begin = set_begin;
 	    last_inv_end = set_inv_end;
 	    last_inv_begin = set_inv_begin;
 	    );
 
 	if(any_sets == FALSE) {
 	    return unpack_simple_rsc_order(xml_obj, data_set);
 	}
 
 	return TRUE;
 }
 
 static gboolean
 unpack_colocation_set(xmlNode *set, int score, pe_working_set_t *data_set) 
 {
     resource_t *with = NULL;
     resource_t *resource = NULL;
     const char *set_id = ID(set);
     const char *role = crm_element_value(set, "role");
     const char *sequential = crm_element_value(set, "sequential");
     int local_score = score;
 
     const char *score_s = crm_element_value(set, XML_RULE_ATTR_SCORE);
     if(score_s) {
 	local_score = char2score(score_s);
     }
     
     if(crm_is_true(sequential)) {
 	xml_child_iter_filter(
 	    set, xml_rsc, XML_TAG_RESOURCE_REF,
 	    
 	    resource = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    if(with != NULL) {
 		crm_debug_2("Colocating %s with %s", resource->id, with->id);
 		rsc_colocation_new(set_id, NULL, local_score, resource, with, role, role, data_set);
 	    }
 
 	    with = resource;
 	    );
     }
     
     return TRUE;
 }
 
 	    
 
 static gboolean colocate_rsc_sets(
     const char *id, xmlNode *set1, xmlNode *set2, int score, pe_working_set_t *data_set)
 {
     resource_t *rsc_1 = NULL;
     resource_t *rsc_2 = NULL;
 	    
     const char *role_1 = crm_element_value(set1, "role");
     const char *role_2 = crm_element_value(set2, "role");
 
     const char *sequential_1 = crm_element_value(set1, "sequential");
     const char *sequential_2 = crm_element_value(set2, "sequential");
 
     if(crm_is_true(sequential_1)) {
 	/* get the first one */
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    break;
 	    );
     }
 
     if(crm_is_true(sequential_2)) {
 	/* get the last one */
 	const char *rid = NULL;
 	xml_child_iter_filter(
 	    set2, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rid = ID(xml_rsc);
 	    );
 	rsc_2 = pe_find_resource(data_set->resources, rid);
     }
 
     if(rsc_1 != NULL && rsc_2 != NULL) {
 	rsc_colocation_new(id, NULL, score, rsc_1, rsc_2, role_1, role_2, data_set);
 
     } else if(rsc_1 != NULL) {
 	xml_child_iter_filter(
 	    set2, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_2 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    rsc_colocation_new(id, NULL, score, rsc_1, rsc_2, role_1, role_2, data_set);
 	    );
 
     } else if(rsc_2 != NULL) {
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 	    rsc_colocation_new(id, NULL, score, rsc_1, rsc_2, role_1, role_2, data_set);
 	    );
 
     } else {
 	xml_child_iter_filter(
 	    set1, xml_rsc, XML_TAG_RESOURCE_REF,
 	    rsc_1 = pe_find_resource(data_set->resources, ID(xml_rsc));
 
 	    xml_child_iter_filter(
 		set2, xml_rsc_2, XML_TAG_RESOURCE_REF,
 		rsc_2 = pe_find_resource(data_set->resources, ID(xml_rsc_2));
 		rsc_colocation_new(id, NULL, score, rsc_1, rsc_2, role_1, role_2, data_set);
 		);
 	    );
     }
 
     return TRUE;
 }
 
 static gboolean unpack_simple_colocation(xmlNode *xml_obj, pe_working_set_t *data_set)
 {
     int score_i = 0;
 
     const char *id       = crm_element_value(xml_obj, XML_ATTR_ID);
     const char *score    = crm_element_value(xml_obj, XML_RULE_ATTR_SCORE);
     
     const char *id_lh    = crm_element_value(xml_obj, XML_COLOC_ATTR_SOURCE);
     const char *id_rh    = crm_element_value(xml_obj, XML_COLOC_ATTR_TARGET);
     const char *state_lh = crm_element_value(xml_obj, XML_COLOC_ATTR_SOURCE_ROLE);
     const char *state_rh = crm_element_value(xml_obj, XML_COLOC_ATTR_TARGET_ROLE);
     const char *attr     = crm_element_value(xml_obj, XML_COLOC_ATTR_NODE_ATTR);    
 
     const char *symmetrical = crm_element_value(xml_obj, XML_CONS_ATTR_SYMMETRICAL);
     
     resource_t *rsc_lh = pe_find_resource(data_set->resources, id_lh);
     resource_t *rsc_rh = pe_find_resource(data_set->resources, id_rh);
     
     if(rsc_lh == NULL) {
 	crm_config_err("No resource (con=%s, rsc=%s)", id, id_lh);
 	return FALSE;
 	
     } else if(rsc_rh == NULL) {
 	crm_config_err("No resource (con=%s, rsc=%s)", id, id_rh);
 	return FALSE;
     }
 
     if(crm_is_true(symmetrical)) {
 	crm_config_warn("The %s colocation constraint attribute has been removed."
 			"  It didn't do what you think it did anyway.",
 			XML_CONS_ATTR_SYMMETRICAL);
     }
 
     if(score) {
 	score_i = char2score(score);
     }
     
     rsc_colocation_new(id, attr, score_i, rsc_lh, rsc_rh, state_lh, state_rh, data_set);
     return TRUE;
 }
 
 gboolean
 unpack_rsc_colocation(xmlNode *xml_obj, pe_working_set_t *data_set)
 {
 	int score_i = 0;
 	xmlNode *last = NULL;
 	gboolean any_sets = FALSE;
 
 	const char *id    = crm_element_value(xml_obj, XML_ATTR_ID);
 	const char *score = crm_element_value(xml_obj, XML_RULE_ATTR_SCORE);
 
 	if(score) {
 	    score_i = char2score(score);
 	}
 	
 	xml_child_iter_filter(
-	    xml_obj, set, "resource_set",
+	    xml_obj, set, XML_CONS_TAG_RSC_SET,
 
 	    any_sets = TRUE;
+	    set = expand_idref(set, data_set->input);
 	    if(unpack_colocation_set(set, score_i, data_set) == FALSE) {
 		return FALSE;
 
 	    } else if(last && colocate_rsc_sets(id, last, set, score_i, data_set) == FALSE) {
 		return FALSE;
 	    }
 	    last = set;
 	    );
 
 	
 	if(any_sets == FALSE) {
 	    return unpack_simple_colocation(xml_obj, data_set);
 	}
 
 	return TRUE;
 }
 
 gboolean is_active(rsc_to_node_t *cons)
 {
 	return TRUE;
 }
diff --git a/xml/constraints.rng.in b/xml/constraints.rng.in
index 4d2a4e0cea..36319db5c2 100644
--- a/xml/constraints.rng.in
+++ b/xml/constraints.rng.in
@@ -1,175 +1,180 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-constraints"/>
   </start>
 
   <define name="element-constraints">
       <zeroOrMore>
 	<choice>
 	  <ref name="element-location"/>
 	  <ref name="element-colocation"/>
 	  <ref name="element-order"/>
 	</choice>
       </zeroOrMore>
   </define>
 
   <define name="element-location">
     <element name="rsc_location">
       <attribute name="id"><data type="ID"/></attribute>
       <attribute name="rsc"><data type="IDREF"/></attribute>
       <choice>
 	<group>
 	  <externalRef href="score.rng"/>
 	  <attribute name="node"><text/></attribute>
 	</group>
 	<oneOrMore>
 	  <externalRef href="rule-@CRM_DTD_VERSION@.rng"/>
 	</oneOrMore>
       </choice>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
     </element>
   </define>
 
   <define name="element-resource-set">
     <element name="resource_set">
-      <attribute name="id"><data type="ID"/></attribute>
-      <optional>
-	<attribute name="sequential"><data type="boolean"/></attribute>
-      </optional>
-      <optional>
-	<attribute name="action">
-	  <ref name="attribute-actions"/>
-	</attribute>
-      </optional>
-      <optional>
-	<attribute name="role">
-	  <ref name="attribute-roles"/>
-	</attribute>
-      </optional>
-      <optional>
-	<externalRef href="score.rng"/>
-      </optional>
-      <oneOrMore>
-	<element name="resource_ref">
-	  <attribute name="id"><data type="IDREF"/></attribute>
-	</element>
-      </oneOrMore>
+      <choice>
+	<attribute name="id-ref"><data type="IDREF"/></attribute>
+	<group>
+	  <attribute name="id"><data type="ID"/></attribute>
+	  <optional>
+	    <attribute name="sequential"><data type="boolean"/></attribute>
+	  </optional>
+	  <optional>
+	    <attribute name="action">
+	      <ref name="attribute-actions"/>
+	    </attribute>
+	  </optional>
+	  <optional>
+	    <attribute name="role">
+	      <ref name="attribute-roles"/>
+	    </attribute>
+	  </optional>
+	  <optional>
+	    <externalRef href="score.rng"/>
+	  </optional>
+	  <oneOrMore>
+	    <element name="resource_ref">
+	      <attribute name="id"><data type="IDREF"/></attribute>
+	    </element>
+	  </oneOrMore>
+	</group>
+      </choice>
     </element>
   </define>
 
   <define name="element-colocation">
     <element name="rsc_colocation">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<choice>
 	  <externalRef href="score.rng"/>
 	  <attribute name="score-attribute"><text/></attribute>
 	  <attribute name="score-attribute-mangle"><text/></attribute>
 	</choice>
       </optional>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
       <choice>
 	<oneOrMore>
 	  <ref name="element-resource-set"/>
 	</oneOrMore>
 	<group>
 	  <attribute name="rsc"><data type="IDREF"/></attribute>
 	  <attribute name="with-rsc"><data type="IDREF"/></attribute>
 	  <optional>
 	    <attribute name="node-attribute"><text/></attribute>
 	  </optional>
 	  <optional>
 	    <attribute name="rsc-role">
 	      <ref name="attribute-roles"/>
 	    </attribute>
 	  </optional>
 	  <optional>
 	    <attribute name="with-rsc-role">
 	      <ref name="attribute-roles"/>
 	    </attribute>
 	  </optional>
 	</group>
       </choice>
     </element>
   </define>
 
   <define name="element-order">
     <element name="rsc_order">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
 	<ref name="element-lifetime"/>
       </optional>
       <optional>
 	<attribute name="symmetrical"><data type="boolean"/></attribute>
       </optional>
       <optional>
 	<choice>
 	  <externalRef href="score.rng"/>
 	  <attribute name="kind">
 	    <ref name="order-types"/>
 	  </attribute>
 	</choice>
       </optional>
       <choice>
 	<oneOrMore>
 	  <ref name="element-resource-set"/>
 	</oneOrMore>
 	<group>
 	  <attribute name="first"><data type="IDREF"/></attribute>
 	  <attribute name="then"><data type="IDREF"/></attribute>
 	  <optional>
 	    <attribute name="first-action">
 	      <ref name="attribute-actions"/>
 	    </attribute>
 	  </optional>
 	  <optional>
 	    <attribute name="then-action">
 	      <ref name="attribute-actions"/>
 	    </attribute>
 	  </optional>
 	</group>
       </choice>
     </element>
   </define>
  
   <define name="attribute-actions">
     <choice>
       <value>start</value>
       <value>promote</value>
       <value>demote</value>
       <value>stop</value>
     </choice>
   </define>
       
   <define name="attribute-roles">
     <choice>
       <value>Stopped</value>
       <value>Started</value>
       <value>Master</value>
       <value>Slave</value>
     </choice>
   </define>
 
   <define name="order-types">
     <choice>
       <value>Optional</value>
       <value>Mandatory</value>
       <value>Serialize</value>
     </choice>
   </define>
 
   <define name="element-lifetime">
     <element name="lifetime">
       <oneOrMore>
 	<externalRef href="rule-@CRM_DTD_VERSION@.rng"/>
       </oneOrMore>
     </element>
   </define>
   
 </grammar>