commit 4b390749bf42df944402e2530a27521e89a45682
Author: Andrew Beekhof <andrew@beekhof.net>
Date: Wed Apr 2 15:24:21 2014 +1100
Refactor: PE: Ensure actions like shutdown and fence have a unique key
(cherry picked from commit 30bb942116c8e9a1e0ace47a98a0447889407d50)
Conflicts:
pengine/regression.sh
pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
pengine/test10/594.exp
pengine/test10/662.exp
pengine/test10/696.exp
pengine/test10/726.exp
pengine/test10/735.exp
pengine/test10/764.exp
pengine/test10/797.exp
pengine/test10/829.exp
pengine/test10/anti-colocation-order.exp
pengine/test10/asymmetric.exp
pengine/test10/attrs1.exp
pengine/test10/attrs2.exp
pengine/test10/attrs3.exp
pengine/test10/attrs4.exp
pengine/test10/attrs5.exp
pengine/test10/attrs6.exp
pengine/test10/attrs7.exp
pengine/test10/attrs8.exp
pengine/test10/balanced.exp
pengine/test10/base-score.exp
pengine/test10/bug-1572-1.exp
pengine/test10/bug-1572-2.exp
pengine/test10/bug-1573.exp
pengine/test10/bug-1820-1.exp
pengine/test10/bug-1820.exp
pengine/test10/bug-1822.exp
pengine/test10/bug-5014-A-start-B-start.exp
pengine/test10/bug-5014-A-stopped-B-stopped.exp
pengine/test10/bug-5014-CLONE-A-start-B-start.exp
pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
pengine/test10/bug-5028-detach.exp
pengine/test10/bug-lf-2160.exp
pengine/test10/bug-lf-2435.exp
pengine/test10/bug-lf-2445.exp
pengine/test10/bug-lf-2581.exp
pengine/test10/bug-lf-2606.exp
pengine/test10/bug-n-387749.exp
pengine/test10/bug-pm-11.exp
pengine/test10/clone-anon-dup.exp
pengine/test10/clone-anon-probe-1.exp
pengine/test10/clone-colocate-instance-1.exp
pengine/test10/clone-colocate-instance-2.exp
pengine/test10/clone-interleave-1.exp
pengine/test10/clone-interleave-2.exp
pengine/test10/clone-interleave-3.exp
pengine/test10/clone-no-shuffle.exp
pengine/test10/clone-order-instance.exp
pengine/test10/clone-order-primitive.exp
pengine/test10/coloc-group.exp
pengine/test10/coloc-list.exp
pengine/test10/coloc-loop.exp
pengine/test10/coloc-many-one.exp
pengine/test10/colocate-primitive-with-clone.exp
pengine/test10/comments.exp
pengine/test10/container-1.exp
pengine/test10/container-2.exp
pengine/test10/container-3.exp
pengine/test10/container-4.exp
pengine/test10/container-group-1.exp
pengine/test10/container-group-2.exp
pengine/test10/container-group-3.exp
pengine/test10/container-group-4.exp
pengine/test10/date-1.exp
pengine/test10/domain.exp
pengine/test10/group-fail.exp
pengine/test10/group-unmanaged-stopped.exp
pengine/test10/group-unmanaged.exp
pengine/test10/group1.exp
pengine/test10/group10.exp
pengine/test10/group11.exp
pengine/test10/group15.exp
pengine/test10/group2.exp
pengine/test10/group3.exp
pengine/test10/group4.exp
pengine/test10/group5.exp
pengine/test10/group6.exp
pengine/test10/group7.exp
pengine/test10/group8.exp
pengine/test10/group9.exp
pengine/test10/honor_stonith_rsc_order1.exp
pengine/test10/honor_stonith_rsc_order2.exp
pengine/test10/honor_stonith_rsc_order3.exp
pengine/test10/honor_stonith_rsc_order4.exp
pengine/test10/ignore_stonith_rsc_order1.exp
pengine/test10/ignore_stonith_rsc_order2.exp
pengine/test10/ignore_stonith_rsc_order3.exp
pengine/test10/ignore_stonith_rsc_order4.exp
pengine/test10/inc0.exp
pengine/test10/inc1.exp
pengine/test10/inc11.exp
pengine/test10/inc12.exp
pengine/test10/inc2.exp
pengine/test10/inc3.exp
pengine/test10/inc4.exp
pengine/test10/inc5.exp
pengine/test10/inc6.exp
pengine/test10/inc7.exp
pengine/test10/inc8.exp
pengine/test10/interleave-0.exp
pengine/test10/interleave-1.exp
pengine/test10/interleave-2.exp
pengine/test10/interleave-3.exp
pengine/test10/location-sets-templates.exp
pengine/test10/managed-0.exp
pengine/test10/managed-1.exp
pengine/test10/managed-2.exp
pengine/test10/master-0.exp
pengine/test10/master-1.exp
pengine/test10/master-10.exp
pengine/test10/master-11.exp
pengine/test10/master-2.exp
pengine/test10/master-3.exp
pengine/test10/master-4.exp
pengine/test10/master-5.exp
pengine/test10/master-6.exp
pengine/test10/master-7.exp
pengine/test10/master-8.exp
pengine/test10/master-9.exp
pengine/test10/master-depend.exp
pengine/test10/master-ordering.exp
pengine/test10/master-probed-score.exp
pengine/test10/master-reattach.exp
pengine/test10/master-stop.exp
pengine/test10/master-unmanaged-monitor.exp
pengine/test10/migrate-1.exp
pengine/test10/migrate-2.exp
pengine/test10/migrate-3.exp
pengine/test10/migrate-4.exp
pengine/test10/migrate-shutdown.exp
pengine/test10/migrate-start-complex.exp
pengine/test10/minimal.exp
pengine/test10/mon-rsc-1.exp
pengine/test10/mon-rsc-2.exp
pengine/test10/mon-rsc-3.exp
pengine/test10/mon-rsc-4.exp
pengine/test10/multi1.exp
pengine/test10/node-maintenance-1.exp
pengine/test10/node-maintenance-2.exp
pengine/test10/notify-0.exp
pengine/test10/notify-1.exp
pengine/test10/notify-2.exp
pengine/test10/notify-3.exp
pengine/test10/novell-239082.exp
pengine/test10/novell-252693-2.exp
pengine/test10/novell-252693-3.exp
pengine/test10/novell-252693.exp
pengine/test10/obsolete-lrm-resource.exp
pengine/test10/one-or-more-0.exp
pengine/test10/one-or-more-1.exp
pengine/test10/one-or-more-2.exp
pengine/test10/one-or-more-3.exp
pengine/test10/one-or-more-4.exp
pengine/test10/one-or-more-5.exp
pengine/test10/order-mandatory.exp
pengine/test10/order-optional-keyword.exp
pengine/test10/order-optional.exp
pengine/test10/order-required.exp
pengine/test10/order-wrong-kind.exp
pengine/test10/order1.exp
pengine/test10/order2.exp
pengine/test10/order3.exp
pengine/test10/order4.exp
pengine/test10/order5.exp
pengine/test10/order6.exp
pengine/test10/order7.exp
pengine/test10/ordered-set-basic-startup.exp
pengine/test10/orphan-0.exp
pengine/test10/orphan-1.exp
pengine/test10/orphan-2.exp
pengine/test10/params-0.exp
pengine/test10/params-1.exp
pengine/test10/params-2.exp
pengine/test10/params-4.exp
pengine/test10/params-5.exp
pengine/test10/per-node-attrs.exp
pengine/test10/placement-capacity.exp
pengine/test10/placement-location.exp
pengine/test10/placement-priority.exp
pengine/test10/placement-stickiness.exp
pengine/test10/probe-0.exp
pengine/test10/probe-1.exp
pengine/test10/probe-timeout.exp
pengine/test10/quorum-1.exp
pengine/test10/quorum-2.exp
pengine/test10/quorum-3.exp
pengine/test10/quorum-4.exp
pengine/test10/quorum-5.exp
pengine/test10/quorum-6.exp
pengine/test10/rec-node-1.exp
pengine/test10/rec-node-10.exp
pengine/test10/rec-node-11.exp
pengine/test10/rec-node-12.exp
pengine/test10/rec-node-15.exp
pengine/test10/rec-node-2.exp
pengine/test10/rec-node-3.exp
pengine/test10/rec-node-4.exp
pengine/test10/rec-node-5.exp
pengine/test10/rec-node-6.exp
pengine/test10/rec-node-7.exp
pengine/test10/rec-node-8.exp
pengine/test10/rec-node-9.exp
pengine/test10/rec-rsc-0.exp
pengine/test10/rec-rsc-1.exp
pengine/test10/rec-rsc-2.exp
pengine/test10/rec-rsc-3.exp
pengine/test10/rec-rsc-4.exp
pengine/test10/rec-rsc-5.exp
pengine/test10/rec-rsc-6.exp
pengine/test10/rec-rsc-7.exp
pengine/test10/rec-rsc-8.exp
pengine/test10/rec-rsc-9.exp
pengine/test10/remote-startup-probes.exp
pengine/test10/remote-startup.exp
pengine/test10/reprobe-target_rc.exp
pengine/test10/rsc-maintenance.exp
pengine/test10/rsc-sets-clone-1.exp
pengine/test10/rsc-sets-clone.exp
pengine/test10/rsc-sets-master.exp
pengine/test10/rsc-sets-seq-false.exp
pengine/test10/rsc-sets-seq-true.exp
pengine/test10/rsc_dep1.exp
pengine/test10/rsc_dep10.exp
pengine/test10/rsc_dep2.exp
pengine/test10/rsc_dep3.exp
pengine/test10/rsc_dep4.exp
pengine/test10/rsc_dep5.exp
pengine/test10/rsc_dep7.exp
pengine/test10/rsc_dep8.exp
pengine/test10/simple11.exp
pengine/test10/simple12.exp
pengine/test10/simple2.exp
pengine/test10/simple3.exp
pengine/test10/simple4.exp
pengine/test10/simple6.exp
pengine/test10/simple7.exp
pengine/test10/simple8.exp
pengine/test10/stonith-3.exp
pengine/test10/stop-failure-no-fencing.exp
pengine/test10/stop-failure-with-fencing.exp
pengine/test10/stopped-monitor-00.exp
pengine/test10/stopped-monitor-01.exp
pengine/test10/stopped-monitor-02.exp
pengine/test10/stopped-monitor-03.exp
pengine/test10/stopped-monitor-04.exp
pengine/test10/stopped-monitor-05.exp
pengine/test10/stopped-monitor-06.exp
pengine/test10/stopped-monitor-07.exp
pengine/test10/stopped-monitor-08.exp
pengine/test10/stopped-monitor-09.exp
pengine/test10/stopped-monitor-10.exp
pengine/test10/stopped-monitor-11.exp
pengine/test10/stopped-monitor-12.exp
pengine/test10/stopped-monitor-20.exp
pengine/test10/stopped-monitor-21.exp
pengine/test10/stopped-monitor-22.exp
pengine/test10/stopped-monitor-23.exp
pengine/test10/stopped-monitor-24.exp
pengine/test10/stopped-monitor-25.exp
pengine/test10/stopped-monitor-26.exp
pengine/test10/stopped-monitor-27.exp
pengine/test10/stopped-monitor-30.exp
pengine/test10/stopped-monitor-31.exp
pengine/test10/systemhealth2.exp
pengine/test10/systemhealth3.exp
pengine/test10/systemhealthm2.exp
pengine/test10/systemhealthm3.exp
pengine/test10/systemhealthn2.exp
pengine/test10/systemhealthn3.exp
pengine/test10/systemhealtho2.exp
pengine/test10/systemhealtho3.exp
pengine/test10/systemhealthp2.exp
pengine/test10/systemhealthp3.exp
pengine/test10/target-0.exp
pengine/test10/target-1.exp
pengine/test10/target-2.exp
pengine/test10/template-1.exp
pengine/test10/template-2.exp
pengine/test10/template-3.exp
pengine/test10/template-clone-group.exp
pengine/test10/template-clone-primitive.exp
pengine/test10/template-coloc-1.exp
pengine/test10/template-coloc-2.exp
pengine/test10/template-coloc-3.exp
pengine/test10/template-order-1.exp
pengine/test10/template-order-2.exp
pengine/test10/template-order-3.exp
pengine/test10/template-rsc-sets-1.exp
pengine/test10/template-rsc-sets-2.exp
pengine/test10/template-rsc-sets-3.exp
pengine/test10/template-rsc-sets-4.exp
pengine/test10/template-ticket.exp
pengine/test10/ticket-clone-1.exp
pengine/test10/ticket-clone-10.exp
pengine/test10/ticket-clone-11.exp
pengine/test10/ticket-clone-12.exp
pengine/test10/ticket-clone-13.exp
pengine/test10/ticket-clone-14.exp
pengine/test10/ticket-clone-15.exp
pengine/test10/ticket-clone-16.exp
pengine/test10/ticket-clone-17.exp
pengine/test10/ticket-clone-18.exp
pengine/test10/ticket-clone-19.exp
pengine/test10/ticket-clone-2.exp
pengine/test10/ticket-clone-20.exp
pengine/test10/ticket-clone-22.exp
pengine/test10/ticket-clone-23.exp
pengine/test10/ticket-clone-24.exp
pengine/test10/ticket-clone-3.exp
pengine/test10/ticket-clone-4.exp
pengine/test10/ticket-clone-5.exp
pengine/test10/ticket-clone-6.exp
pengine/test10/ticket-clone-7.exp
pengine/test10/ticket-clone-8.exp
pengine/test10/ticket-group-1.exp
pengine/test10/ticket-group-10.exp
pengine/test10/ticket-group-11.exp
pengine/test10/ticket-group-12.exp
pengine/test10/ticket-group-13.exp
pengine/test10/ticket-group-14.exp
pengine/test10/ticket-group-15.exp
pengine/test10/ticket-group-16.exp
pengine/test10/ticket-group-17.exp
pengine/test10/ticket-group-18.exp
pengine/test10/ticket-group-19.exp
pengine/test10/ticket-group-2.exp
pengine/test10/ticket-group-20.exp
pengine/test10/ticket-group-21.exp
pengine/test10/ticket-group-22.exp
pengine/test10/ticket-group-23.exp
pengine/test10/ticket-group-24.exp
pengine/test10/ticket-group-3.exp
pengine/test10/ticket-group-4.exp
pengine/test10/ticket-group-5.exp
pengine/test10/ticket-group-6.exp
pengine/test10/ticket-group-7.exp
pengine/test10/ticket-group-8.exp
pengine/test10/ticket-group-9.exp
pengine/test10/ticket-master-1.exp
pengine/test10/ticket-master-10.exp
pengine/test10/ticket-master-11.exp
pengine/test10/ticket-master-12.exp
pengine/test10/ticket-master-13.exp
pengine/test10/ticket-master-14.exp
pengine/test10/ticket-master-15.exp
pengine/test10/ticket-master-16.exp
pengine/test10/ticket-master-17.exp
pengine/test10/ticket-master-18.exp
pengine/test10/ticket-master-19.exp
pengine/test10/ticket-master-2.exp
pengine/test10/ticket-master-20.exp
pengine/test10/ticket-master-21.exp
pengine/test10/ticket-master-22.exp
pengine/test10/ticket-master-23.exp
pengine/test10/ticket-master-24.exp
pengine/test10/ticket-master-3.exp
pengine/test10/ticket-master-4.exp
pengine/test10/ticket-master-5.exp
pengine/test10/ticket-master-6.exp
pengine/test10/ticket-master-7.exp
pengine/test10/ticket-master-8.exp
pengine/test10/ticket-master-9.exp
pengine/test10/ticket-primitive-1.exp
pengine/test10/ticket-primitive-10.exp
pengine/test10/ticket-primitive-11.exp
pengine/test10/ticket-primitive-12.exp
pengine/test10/ticket-primitive-13.exp
pengine/test10/ticket-primitive-14.exp
pengine/test10/ticket-primitive-15.exp
pengine/test10/ticket-primitive-16.exp
pengine/test10/ticket-primitive-17.exp
pengine/test10/ticket-primitive-18.exp
pengine/test10/ticket-primitive-19.exp
pengine/test10/ticket-primitive-2.exp
pengine/test10/ticket-primitive-20.exp
pengine/test10/ticket-primitive-21.exp
pengine/test10/ticket-primitive-22.exp
pengine/test10/ticket-primitive-23.exp
pengine/test10/ticket-primitive-24.exp
pengine/test10/ticket-primitive-3.exp
pengine/test10/ticket-primitive-4.exp
pengine/test10/ticket-primitive-5.exp
pengine/test10/ticket-primitive-6.exp
pengine/test10/ticket-primitive-7.exp
pengine/test10/ticket-primitive-8.exp
pengine/test10/ticket-primitive-9.exp
pengine/test10/ticket-rsc-sets-1.exp
pengine/test10/ticket-rsc-sets-10.exp
pengine/test10/ticket-rsc-sets-11.exp
pengine/test10/ticket-rsc-sets-12.exp
pengine/test10/ticket-rsc-sets-13.exp
pengine/test10/ticket-rsc-sets-14.exp
pengine/test10/ticket-rsc-sets-2.exp
pengine/test10/ticket-rsc-sets-3.exp
pengine/test10/ticket-rsc-sets-4.exp
pengine/test10/ticket-rsc-sets-5.exp
pengine/test10/ticket-rsc-sets-6.exp
pengine/test10/ticket-rsc-sets-7.exp
pengine/test10/ticket-rsc-sets-8.exp
pengine/test10/ticket-rsc-sets-9.exp
pengine/test10/unmanaged-master.exp
pengine/test10/unmanaged-stop-1.exp
pengine/test10/unmanaged-stop-2.exp
pengine/test10/unmanaged-stop-3.exp
pengine/test10/unmanaged-stop-4.exp
pengine/test10/unrunnable-1.exp
pengine/test10/use-after-free-merge.exp
pengine/test10/utilization-order1.exp
pengine/test10/utilization-order2.exp
pengine/test10/utilization-order3.exp
pengine/test10/utilization.exp
pengine/test10/whitebox-ms-ordering.exp
diff --git a/pengine/allocate.c b/pengine/allocate.c
index a8e5412..a07fdad 100644
--- a/pengine/allocate.c
+++ b/pengine/allocate.c
@@ -851,14 +851,14 @@ probe_resources(pe_working_set_t * data_set)
}
if (probed != NULL && crm_is_true(probed) == FALSE) {
- action_t *probe_op = custom_action(NULL, strdup(CRM_OP_REPROBE),
+ action_t *probe_op = custom_action(NULL, g_strdup_printf("%s-%s", CRM_OP_REPROBE, node->details->uname),
CRM_OP_REPROBE, node, FALSE, TRUE, data_set);
add_hash_param(probe_op->meta, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE);
continue;
}
- probe_node_complete = custom_action(NULL, strdup(CRM_OP_PROBED),
+ probe_node_complete = custom_action(NULL, g_strdup_printf("%s-%s", CRM_OP_PROBED, node->details->uname),
CRM_OP_PROBED, node, FALSE, TRUE, data_set);
if (crm_is_true(probed)) {
crm_trace("unset");
@@ -1265,21 +1265,22 @@ any_managed_resources(pe_working_set_t * data_set)
action_t *
pe_fence_op(node_t * node, const char *op, pe_working_set_t * data_set)
{
+ char *key = NULL;
action_t *stonith_op = NULL;
if(op == NULL) {
op = data_set->stonith_action;
}
- stonith_op = custom_action(
- NULL, g_strdup_printf("%s-%s-%s", CRM_OP_FENCE, node->details->uname, op),
- CRM_OP_FENCE, node, FALSE, TRUE, data_set);
-
- add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET, node->details->uname);
+ key = g_strdup_printf("%s-%s-%s", CRM_OP_FENCE, node->details->uname, op);
- add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET_UUID, node->details->id);
+ if(stonith_op == NULL) {
+ stonith_op = custom_action(NULL, key, CRM_OP_FENCE, node, FALSE, TRUE, data_set);
- add_hash_param(stonith_op->meta, "stonith_action", op);
+ add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET, node->details->uname);
+ add_hash_param(stonith_op->meta, XML_LRM_ATTR_TARGET_UUID, node->details->id);
+ add_hash_param(stonith_op->meta, "stonith_action", op);
+ }
return stonith_op;
}
@@ -1338,7 +1339,7 @@ stage6(pe_working_set_t * data_set)
crm_notice("Scheduling Node %s for shutdown", node->details->uname);
- down_op = custom_action(NULL, strdup(CRM_OP_SHUTDOWN),
+ down_op = custom_action(NULL, g_strdup_printf("%s-%s", CRM_OP_SHUTDOWN, node->details->uname),
CRM_OP_SHUTDOWN, node, FALSE, TRUE, data_set);
shutdown_constraints(node, down_op, data_set);
@@ -1367,20 +1368,22 @@ stage6(pe_working_set_t * data_set)
}
if (dc_down != NULL) {
- GListPtr shutdown_matches = find_actions(data_set->actions, CRM_OP_SHUTDOWN, NULL);
+ GListPtr gIter = NULL;
crm_trace("Ordering shutdowns before %s on %s (DC)",
dc_down->task, dc_down->node->details->uname);
add_hash_param(dc_down->meta, XML_ATTR_TE_NOWAIT, XML_BOOLEAN_TRUE);
- gIter = shutdown_matches;
- for (; gIter != NULL; gIter = gIter->next) {
+ for (gIter = data_set->actions; gIter != NULL; gIter = gIter->next) {
action_t *node_stop = (action_t *) gIter->data;
- if (node_stop->node->details->is_dc) {
+ if (safe_str_neq(CRM_OP_SHUTDOWN, node_stop->task)) {
+ continue;
+ } else if (node_stop->node->details->is_dc) {
continue;
}
+
crm_debug("Ordering shutdown on %s before %s on %s",
node_stop->node->details->uname,
dc_down->task, dc_down->node->details->uname);
@@ -1391,7 +1394,6 @@ stage6(pe_working_set_t * data_set)
if (last_stonith && dc_down != last_stonith) {
order_actions(last_stonith, dc_down, pe_order_optional);
}
- g_list_free(shutdown_matches);
}
if (last_stonith) {
diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
new file mode 100644
index 0000000..6374d93
--- /dev/null
+++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
@@ -0,0 +1,168 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="7" operation="start" operation_key="myclone_start_0" internal_operation_key="myclone:0_start_0" on_node="f20node2" on_node_uuid="2">
+ <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="8" operation="start" operation_key="myclone-clone_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="6" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1">
+ <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="10" operation="stop" operation_key="myclone-clone_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="5" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2">
+ <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3" priority="1000000">
+ <action_set>
+ <pseudo_event id="11" operation="stopped" operation_key="myclone-clone_stopped_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="10" operation="stop" operation_key="myclone-clone_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <pseudo_event id="10" operation="stop" operation_key="myclone-clone_stop_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="12" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5" priority="1000000">
+ <action_set>
+ <pseudo_event id="9" operation="running" operation_key="myclone-clone_running_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="start" operation_key="myclone_start_0" internal_operation_key="myclone:0_start_0" on_node="f20node2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="8" operation="start" operation_key="myclone-clone_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <pseudo_event id="8" operation="start" operation_key="myclone-clone_start_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="11" operation="stopped" operation_key="myclone-clone_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="13" operation="start" operation_key="vm_start_0" on_node="f20node2" on_node_uuid="2">
+ <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="9" operation="running" operation_key="myclone-clone_running_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="12" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="12" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1">
+ <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-f20node2" on_node="f20node2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-f20node2" on_node="f20node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="12" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
index f1e77f8..357921c 100644
--- a/pengine/test10/594.exp
+++ b/pengine/test10/594.exp
@@ -191,7 +191,7 @@
</synapse>
<synapse id="16">
<action_set>
- <crm_event id="36" operation="do_shutdown" operation_key="do_shutdown" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <crm_event id="36" operation="do_shutdown" operation_key="do_shutdown-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -221,7 +221,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -236,7 +236,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-hadev1" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -260,10 +260,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-hadev1" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
</trigger>
<trigger>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp
index 90f8a54..910f85f 100644
--- a/pengine/test10/662.exp
+++ b/pengine/test10/662.exp
@@ -282,7 +282,7 @@
</synapse>
<synapse id="29">
<action_set>
- <crm_event id="62" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <crm_event id="62" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -297,7 +297,7 @@
</synapse>
<synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="33" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="33" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -321,7 +321,7 @@
</synapse>
<synapse id="31" priority="1000000">
<action_set>
- <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="25" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -351,7 +351,7 @@
</synapse>
<synapse id="32" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -378,7 +378,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -408,16 +408,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="25" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="33" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="33" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/696.exp b/pengine/test10/696.exp
index ec6a5f6..45bf881 100644
--- a/pengine/test10/696.exp
+++ b/pengine/test10/696.exp
@@ -309,7 +309,7 @@
</synapse>
<synapse id="29" priority="1000000">
<action_set>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -330,7 +330,7 @@
</synapse>
<synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -351,7 +351,7 @@
</synapse>
<synapse id="31" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev1" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -387,13 +387,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev1" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
<trigger>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/726.exp b/pengine/test10/726.exp
index 0f56ae3..0a10a6d 100644
--- a/pengine/test10/726.exp
+++ b/pengine/test10/726.exp
@@ -531,7 +531,7 @@
</synapse>
<synapse id="49" priority="1000000">
<action_set>
- <rsc_op id="32" operation="probe_complete" operation_key="probe_complete" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
+ <rsc_op id="32" operation="probe_complete" operation_key="probe_complete-test03" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -552,7 +552,7 @@
</synapse>
<synapse id="50" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-test02" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -585,7 +585,7 @@
</synapse>
<synapse id="51" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-sgi2" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -621,7 +621,7 @@
</synapse>
<synapse id="52" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-ibm1" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -663,16 +663,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-ibm1" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-sgi2" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-test02" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/>
</trigger>
<trigger>
- <rsc_op id="32" operation="probe_complete" operation_key="probe_complete" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/>
+ <rsc_op id="32" operation="probe_complete" operation_key="probe_complete-test03" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/735.exp b/pengine/test10/735.exp
index fd66dfe..e4b73e5 100644
--- a/pengine/test10/735.exp
+++ b/pengine/test10/735.exp
@@ -182,7 +182,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -209,7 +209,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-hadev3" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/764.exp b/pengine/test10/764.exp
index 890665a..bbb2d32 100644
--- a/pengine/test10/764.exp
+++ b/pengine/test10/764.exp
@@ -156,7 +156,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-posic043" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -177,7 +177,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-posic041" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -204,10 +204,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-posic041" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-posic043" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp
index cac962d..02ef70b 100644
--- a/pengine/test10/797.exp
+++ b/pengine/test10/797.exp
@@ -324,7 +324,7 @@
</synapse>
<synapse id="28">
<action_set>
- <crm_event id="51" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <crm_event id="51" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -342,7 +342,7 @@
</synapse>
<synapse id="29" priority="1000000">
<action_set>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -363,7 +363,7 @@
</synapse>
<synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -381,7 +381,7 @@
</synapse>
<synapse id="31" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -414,13 +414,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
index 749014f..21a9ecd 100644
--- a/pengine/test10/829.exp
+++ b/pengine/test10/829.exp
@@ -266,7 +266,7 @@
</synapse>
<synapse id="25" priority="1000000">
<action_set>
- <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="25" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -287,7 +287,7 @@
</synapse>
<synapse id="26" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -314,7 +314,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -350,13 +350,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="25" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/anti-colocation-order.exp b/pengine/test10/anti-colocation-order.exp
new file mode 100644
index 0000000..99d5f3a
--- /dev/null
+++ b/pengine/test10/anti-colocation-order.exp
@@ -0,0 +1,217 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0" priority="100">
+ <action_set>
+ <pseudo_event id="12" operation="stopped" operation_key="group1_stopped_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1" priority="100">
+ <action_set>
+ <pseudo_event id="11" operation="stop" operation_key="group1_stop_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2" priority="100">
+ <action_set>
+ <pseudo_event id="10" operation="running" operation_key="group1_running_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3" priority="100">
+ <action_set>
+ <pseudo_event id="9" operation="start" operation_key="group1_start_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="12" operation="stopped" operation_key="group1_stopped_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="18" operation="stopped" operation_key="group2_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4" priority="100">
+ <action_set>
+ <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5" priority="100">
+ <action_set>
+ <rsc_op id="5" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="6" priority="100">
+ <action_set>
+ <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7" priority="100">
+ <action_set>
+ <rsc_op id="7" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8" priority="10">
+ <action_set>
+ <pseudo_event id="18" operation="stopped" operation_key="group2_stopped_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="13" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="14" operation="stop" operation_key="rsc4_stop_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="17" operation="stop" operation_key="group2_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9" priority="10">
+ <action_set>
+ <pseudo_event id="17" operation="stop" operation_key="group2_stop_0">
+ <attributes CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="10" priority="10">
+ <action_set>
+ <rsc_op id="13" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc3" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="14" operation="stop" operation_key="rsc4_stop_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="17" operation="stop" operation_key="group2_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11" priority="10">
+ <action_set>
+ <rsc_op id="14" operation="stop" operation_key="rsc4_stop_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc4" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="17" operation="stop" operation_key="group2_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="12" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="13" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="14">
+ <action_set>
+ <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="13" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="14" operation="stop" operation_key="rsc4_stop_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/asymmetric.exp b/pengine/test10/asymmetric.exp
index 33850dd..52a2327 100644
--- a/pengine/test10/asymmetric.exp
+++ b/pengine/test10/asymmetric.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,7 +49,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -67,10 +67,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs1.exp b/pengine/test10/attrs1.exp
index 9e83487..8dd6a40 100644
--- a/pengine/test10/attrs1.exp
+++ b/pengine/test10/attrs1.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs2.exp b/pengine/test10/attrs2.exp
index 9e83487..8dd6a40 100644
--- a/pengine/test10/attrs2.exp
+++ b/pengine/test10/attrs2.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs3.exp b/pengine/test10/attrs3.exp
index 99b81e7..b6e55a2 100644
--- a/pengine/test10/attrs3.exp
+++ b/pengine/test10/attrs3.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs4.exp b/pengine/test10/attrs4.exp
index 99b81e7..b6e55a2 100644
--- a/pengine/test10/attrs4.exp
+++ b/pengine/test10/attrs4.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs5.exp b/pengine/test10/attrs5.exp
index c7f836f..5e7b2c7 100644
--- a/pengine/test10/attrs5.exp
+++ b/pengine/test10/attrs5.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs6.exp b/pengine/test10/attrs6.exp
index 99b81e7..b6e55a2 100644
--- a/pengine/test10/attrs6.exp
+++ b/pengine/test10/attrs6.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs7.exp b/pengine/test10/attrs7.exp
index 9e83487..8dd6a40 100644
--- a/pengine/test10/attrs7.exp
+++ b/pengine/test10/attrs7.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/attrs8.exp b/pengine/test10/attrs8.exp
index 9e83487..8dd6a40 100644
--- a/pengine/test10/attrs8.exp
+++ b/pengine/test10/attrs8.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/balanced.exp b/pengine/test10/balanced.exp
index e6e96d0..c188632 100644
--- a/pengine/test10/balanced.exp
+++ b/pengine/test10/balanced.exp
@@ -69,7 +69,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -84,7 +84,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -105,10 +105,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/base-score.exp b/pengine/test10/base-score.exp
index b6710f5..ab71c3b 100644
--- a/pengine/test10/base-score.exp
+++ b/pengine/test10/base-score.exp
@@ -50,7 +50,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="puma4" on_node_uuid="puma4">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-puma4" on_node="puma4" on_node_uuid="puma4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,7 +62,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="puma3">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="puma3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -74,7 +74,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma2" on_node_uuid="puma2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma2" on_node="puma2" on_node_uuid="puma2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -86,7 +86,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="puma1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="puma1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -104,16 +104,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="puma1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="puma1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma2" on_node_uuid="puma2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma2" on_node="puma2" on_node_uuid="puma2"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="puma3"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="puma3"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="puma4" on_node_uuid="puma4"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-puma4" on_node="puma4" on_node_uuid="puma4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-1572-1.exp b/pengine/test10/bug-1572-1.exp
index 2b3bf4c..c0184ae 100644
--- a/pengine/test10/bug-1572-1.exp
+++ b/pengine/test10/bug-1572-1.exp
@@ -750,7 +750,7 @@
</synapse>
<synapse id="50">
<action_set>
- <crm_event id="47" operation="do_shutdown" operation_key="do_shutdown" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
+ <crm_event id="47" operation="do_shutdown" operation_key="do_shutdown-arc-dknightlx" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp
index ad91bab..465bf1d 100644
--- a/pengine/test10/bug-1572-2.exp
+++ b/pengine/test10/bug-1572-2.exp
@@ -371,7 +371,7 @@
</synapse>
<synapse id="26">
<action_set>
- <crm_event id="43" operation="do_shutdown" operation_key="do_shutdown" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
+ <crm_event id="43" operation="do_shutdown" operation_key="do_shutdown-arc-dknightlx" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-1573.exp b/pengine/test10/bug-1573.exp
index 86eb893..39f7a61 100644
--- a/pengine/test10/bug-1573.exp
+++ b/pengine/test10/bug-1573.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3">
<action_set>
- <crm_event id="15" operation="do_shutdown" operation_key="do_shutdown" on_node="xen-b" on_node_uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2">
+ <crm_event id="15" operation="do_shutdown" operation_key="do_shutdown-xen-b" on_node="xen-b" on_node_uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-1820-1.exp b/pengine/test10/bug-1820-1.exp
index 732ded8..2753fd0 100644
--- a/pengine/test10/bug-1820-1.exp
+++ b/pengine/test10/bug-1820-1.exp
@@ -178,7 +178,7 @@
</synapse>
<synapse id="13">
<action_set>
- <crm_event id="21" operation="do_shutdown" operation_key="do_shutdown" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
+ <crm_event id="21" operation="do_shutdown" operation_key="do_shutdown-star" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -193,7 +193,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-world" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -205,7 +205,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-star" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -223,10 +223,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-star" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-world" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-1820.exp b/pengine/test10/bug-1820.exp
index ad98db1..434d4b6 100644
--- a/pengine/test10/bug-1820.exp
+++ b/pengine/test10/bug-1820.exp
@@ -175,7 +175,7 @@
</synapse>
<synapse id="12">
<action_set>
- <crm_event id="18" operation="do_shutdown" operation_key="do_shutdown" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
+ <crm_event id="18" operation="do_shutdown" operation_key="do_shutdown-star" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-1822.exp b/pengine/test10/bug-1822.exp
index 0e101b5..6dc28f8 100644
--- a/pengine/test10/bug-1822.exp
+++ b/pengine/test10/bug-1822.exp
@@ -166,7 +166,7 @@
</synapse>
<synapse id="12">
<action_set>
- <crm_event id="37" operation="do_shutdown" operation_key="do_shutdown" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
+ <crm_event id="37" operation="do_shutdown" operation_key="do_shutdown-process1a" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-5014-A-start-B-start.exp b/pengine/test10/bug-5014-A-start-B-start.exp
index 63c271d..6670814 100644
--- a/pengine/test10/bug-5014-A-start-B-start.exp
+++ b/pengine/test10/bug-5014-A-start-B-start.exp
@@ -74,7 +74,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -95,7 +95,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-5014-A-stopped-B-stopped.exp b/pengine/test10/bug-5014-A-stopped-B-stopped.exp
index e1a25cd..8814477 100644
--- a/pengine/test10/bug-5014-A-stopped-B-stopped.exp
+++ b/pengine/test10/bug-5014-A-stopped-B-stopped.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -40,7 +40,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-5014-CLONE-A-start-B-start.exp b/pengine/test10/bug-5014-CLONE-A-start-B-start.exp
index 30d8952..1fc2c70 100644
--- a/pengine/test10/bug-5014-CLONE-A-start-B-start.exp
+++ b/pengine/test10/bug-5014-CLONE-A-start-B-start.exp
@@ -127,7 +127,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -148,7 +148,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
index 6961d8a..318ba6f 100644
--- a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
+++ b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
@@ -28,7 +28,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-5028-detach.exp b/pengine/test10/bug-5028-detach.exp
index 1c3374b..58d12ec 100644
--- a/pengine/test10/bug-5028-detach.exp
+++ b/pengine/test10/bug-5028-detach.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0">
<action_set>
- <crm_event id="14" operation="do_shutdown" operation_key="do_shutdown" on_node="bl460g6a" on_node_uuid="11111111-1111-1111-1111-111111111111">
+ <crm_event id="14" operation="do_shutdown" operation_key="do_shutdown-bl460g6a" on_node="bl460g6a" on_node_uuid="11111111-1111-1111-1111-111111111111">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/bug-lf-2160.exp b/pengine/test10/bug-lf-2160.exp
index ed0b455..3d41f1e 100644
--- a/pengine/test10/bug-lf-2160.exp
+++ b/pengine/test10/bug-lf-2160.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="cardhu" on_node_uuid="cardhu">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-cardhu" on_node="cardhu" on_node_uuid="cardhu">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -40,7 +40,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="cardhu" on_node_uuid="cardhu"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-cardhu" on_node="cardhu" on_node_uuid="cardhu"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp
index 7255127..5a12601 100644
--- a/pengine/test10/bug-lf-2435.exp
+++ b/pengine/test10/bug-lf-2435.exp
@@ -70,7 +70,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-c21.chepkov.lan" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -82,7 +82,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-c20.chepkov.lan" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -94,7 +94,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c19.chepkov.lan" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -112,13 +112,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c19.chepkov.lan" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-c20.chepkov.lan" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-c21.chepkov.lan" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-lf-2445.exp b/pengine/test10/bug-lf-2445.exp
index 5733768..d8f88c3 100644
--- a/pengine/test10/bug-lf-2445.exp
+++ b/pengine/test10/bug-lf-2445.exp
@@ -80,7 +80,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -88,7 +88,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/bug-lf-2581.exp b/pengine/test10/bug-lf-2581.exp
index 60667fc..2906613 100644
--- a/pengine/test10/bug-lf-2581.exp
+++ b/pengine/test10/bug-lf-2581.exp
@@ -230,7 +230,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="queen" on_node_uuid="queen">
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-queen" on_node="queen" on_node_uuid="queen">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -266,7 +266,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="queen" on_node_uuid="queen"/>
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-queen" on_node="queen" on_node_uuid="queen"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-lf-2606.exp b/pengine/test10/bug-lf-2606.exp
index 270131a..71d8457 100644
--- a/pengine/test10/bug-lf-2606.exp
+++ b/pengine/test10/bug-lf-2606.exp
@@ -160,7 +160,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/bug-n-387749.exp b/pengine/test10/bug-n-387749.exp
index 394f8ac..ea0cc27 100644
--- a/pengine/test10/bug-n-387749.exp
+++ b/pengine/test10/bug-n-387749.exp
@@ -345,7 +345,7 @@
</synapse>
<synapse id="25" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-power720-1" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -375,7 +375,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-power720-1" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-pm-11.exp b/pengine/test10/bug-pm-11.exp
index 42d405f..bb23360 100644
--- a/pengine/test10/bug-pm-11.exp
+++ b/pengine/test10/bug-pm-11.exp
@@ -213,7 +213,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node-b" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -228,7 +228,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node-a" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -249,10 +249,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node-a" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node-b" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/bug-suse-707150.exp b/pengine/test10/bug-suse-707150.exp
index 270b3fd..ca3d57b 100644
--- a/pengine/test10/bug-suse-707150.exp
+++ b/pengine/test10/bug-suse-707150.exp
@@ -169,7 +169,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="hex-9" on_node_uuid="hex-9">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-hex-9" on_node="hex-9" on_node_uuid="hex-9">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -187,7 +187,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="hex-9" on_node_uuid="hex-9"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-hex-9" on_node="hex-9" on_node_uuid="hex-9"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-anon-dup.exp b/pengine/test10/clone-anon-dup.exp
index 69ed601..1fea098 100644
--- a/pengine/test10/clone-anon-dup.exp
+++ b/pengine/test10/clone-anon-dup.exp
@@ -107,7 +107,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-wc03" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -119,7 +119,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-wc02" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -131,7 +131,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-wc01" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -149,13 +149,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-wc01" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-wc02" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-wc03" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-anon-probe-1.exp b/pengine/test10/clone-anon-probe-1.exp
index 13b8d3d..6a0b6de 100644
--- a/pengine/test10/clone-anon-probe-1.exp
+++ b/pengine/test10/clone-anon-probe-1.exp
@@ -77,7 +77,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-mysql-02" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,7 +89,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-mysql-01" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -107,10 +107,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-mysql-01" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-mysql-02" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-colocate-instance-1.exp b/pengine/test10/clone-colocate-instance-1.exp
index 0d358be..c1d4629 100644
--- a/pengine/test10/clone-colocate-instance-1.exp
+++ b/pengine/test10/clone-colocate-instance-1.exp
@@ -139,7 +139,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -181,10 +181,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-colocate-instance-2.exp b/pengine/test10/clone-colocate-instance-2.exp
index a02a737..34d03bd 100644
--- a/pengine/test10/clone-colocate-instance-2.exp
+++ b/pengine/test10/clone-colocate-instance-2.exp
@@ -139,7 +139,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -181,10 +181,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-interleave-1.exp b/pengine/test10/clone-interleave-1.exp
new file mode 100644
index 0000000..a0d8995
--- /dev/null
+++ b/pengine/test10/clone-interleave-1.exp
@@ -0,0 +1,231 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="6" operation="start" operation_key="dummy_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="24" operation="running" operation_key="clone-3_running_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="7" operation="start" operation_key="child-1:0_start_0" on_node="pcmk-2" on_node_uuid="2">
+ <primitive id="child-1" long-id="child-1:0" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="10" operation="start" operation_key="clone-1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="8" operation="start" operation_key="child-1:1_start_0" on_node="pcmk-3" on_node_uuid="3">
+ <primitive id="child-1" long-id="child-1:1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="10" operation="start" operation_key="clone-1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="9" operation="start" operation_key="child-1:2_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-1" long-id="child-1:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="10" operation="start" operation_key="clone-1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4" priority="1000000">
+ <action_set>
+ <pseudo_event id="11" operation="running" operation_key="clone-1_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="start" operation_key="child-1:0_start_0" on_node="pcmk-2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="8" operation="start" operation_key="child-1:1_start_0" on_node="pcmk-3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="9" operation="start" operation_key="child-1:2_start_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="10" operation="start" operation_key="clone-1_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="10" operation="start" operation_key="clone-1_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="14" operation="start" operation_key="child-2:0_start_0" on_node="pcmk-2" on_node_uuid="2">
+ <primitive id="child-2" long-id="child-2:0" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="start" operation_key="child-1:0_start_0" on_node="pcmk-2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="16" operation="start" operation_key="clone-2_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="15" operation="start" operation_key="child-2:1_start_0" on_node="pcmk-3" on_node_uuid="3">
+ <primitive id="child-2" long-id="child-2:1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="8" operation="start" operation_key="child-1:1_start_0" on_node="pcmk-3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="16" operation="start" operation_key="clone-2_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8" priority="1000000">
+ <action_set>
+ <pseudo_event id="17" operation="running" operation_key="clone-2_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="14" operation="start" operation_key="child-2:0_start_0" on_node="pcmk-2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="15" operation="start" operation_key="child-2:1_start_0" on_node="pcmk-3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="16" operation="start" operation_key="clone-2_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <pseudo_event id="16" operation="start" operation_key="clone-2_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="11" operation="running" operation_key="clone-1_running_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <rsc_op id="21" operation="start" operation_key="child-3:1_start_0" on_node="pcmk-2" on_node_uuid="2">
+ <primitive id="child-3" long-id="child-3:1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="14" operation="start" operation_key="child-2:0_start_0" on_node="pcmk-2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="23" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <rsc_op id="22" operation="start" operation_key="child-3:2_start_0" on_node="pcmk-3" on_node_uuid="3">
+ <primitive id="child-3" long-id="child-3:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="15" operation="start" operation_key="child-2:1_start_0" on_node="pcmk-3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="23" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="12" priority="1000000">
+ <action_set>
+ <pseudo_event id="24" operation="running" operation_key="clone-3_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="21" operation="start" operation_key="child-3:1_start_0" on_node="pcmk-2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="22" operation="start" operation_key="child-3:2_start_0" on_node="pcmk-3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="23" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <pseudo_event id="23" operation="start" operation_key="clone-3_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="17" operation="running" operation_key="clone-2_running_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="14" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="3">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="15" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="16" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/clone-interleave-2.exp b/pengine/test10/clone-interleave-2.exp
new file mode 100644
index 0000000..fa59afb
--- /dev/null
+++ b/pengine/test10/clone-interleave-2.exp
@@ -0,0 +1,176 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="7" operation="start" operation_key="dummy_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="34" operation="running" operation_key="clone-3_running_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="6" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="18" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-2" long-id="child-2:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="25" operation="stop" operation_key="clone-2_stop_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="27" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3" priority="1000000">
+ <action_set>
+ <pseudo_event id="26" operation="stopped" operation_key="clone-2_stopped_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="18" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="25" operation="stop" operation_key="clone-2_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <pseudo_event id="25" operation="stop" operation_key="clone-2_stop_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="36" operation="stopped" operation_key="clone-3_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="27" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-3" long-id="child-3:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="35" operation="stop" operation_key="clone-3_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="6" priority="1000000">
+ <action_set>
+ <pseudo_event id="36" operation="stopped" operation_key="clone-3_stopped_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="27" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="35" operation="stop" operation_key="clone-3_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <pseudo_event id="35" operation="stop" operation_key="clone-3_stop_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8" priority="1000000">
+ <action_set>
+ <pseudo_event id="34" operation="running" operation_key="clone-3_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="33" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <pseudo_event id="33" operation="start" operation_key="clone-3_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="36" operation="stopped" operation_key="clone-3_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="3">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="11" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="12" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="18" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="27" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/clone-interleave-3.exp b/pengine/test10/clone-interleave-3.exp
new file mode 100644
index 0000000..85f6d8b
--- /dev/null
+++ b/pengine/test10/clone-interleave-3.exp
@@ -0,0 +1,244 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="8" operation="start" operation_key="dummy_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="35" operation="running" operation_key="clone-3_running_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="7" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="dummy" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="19" operation="start" operation_key="child-2:2_start_0" internal_operation_key="child-2:0_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-2" long-id="child-2:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="24" operation="start" operation_key="clone-2_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="1" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-2" long-id="child-2:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="26" operation="stop" operation_key="clone-2_stop_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="28" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4" priority="1000000">
+ <action_set>
+ <pseudo_event id="27" operation="stopped" operation_key="clone-2_stopped_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="26" operation="stop" operation_key="clone-2_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="26" operation="stop" operation_key="clone-2_stop_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="37" operation="stopped" operation_key="clone-3_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="6" priority="1000000">
+ <action_set>
+ <pseudo_event id="25" operation="running" operation_key="clone-2_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="child-2:2_start_0" internal_operation_key="child-2:0_start_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="24" operation="start" operation_key="clone-2_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <pseudo_event id="24" operation="start" operation_key="clone-2_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="27" operation="stopped" operation_key="clone-2_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="29" operation="start" operation_key="child-3:2_start_0" internal_operation_key="child-3:0_start_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-3" long-id="child-3:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="child-2:2_start_0" internal_operation_key="child-2:0_start_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="28" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="34" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <rsc_op id="28" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="child-3" long-id="child-3:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="36" operation="stop" operation_key="clone-3_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10" priority="1000000">
+ <action_set>
+ <pseudo_event id="37" operation="stopped" operation_key="clone-3_stopped_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="28" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="36" operation="stop" operation_key="clone-3_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <pseudo_event id="36" operation="stop" operation_key="clone-3_stop_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="12" priority="1000000">
+ <action_set>
+ <pseudo_event id="35" operation="running" operation_key="clone-3_running_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="29" operation="start" operation_key="child-3:2_start_0" internal_operation_key="child-3:0_start_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="34" operation="start" operation_key="clone-3_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <pseudo_event id="34" operation="start" operation_key="clone-3_start_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="25" operation="running" operation_key="clone-2_running_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="37" operation="stopped" operation_key="clone-3_stopped_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="14" priority="1000000">
+ <action_set>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="3">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="15" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="16" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="17">
+ <action_set>
+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="1" operation="stop" operation_key="child-2:2_stop_0" internal_operation_key="child-2:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="stop" operation_key="dummy_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="28" operation="stop" operation_key="child-3:2_stop_0" internal_operation_key="child-3:0_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/clone-no-shuffle.exp b/pengine/test10/clone-no-shuffle.exp
index c6437a6..4c9ee1b 100644
--- a/pengine/test10/clone-no-shuffle.exp
+++ b/pengine/test10/clone-no-shuffle.exp
@@ -436,7 +436,7 @@
</synapse>
<synapse id="32" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-dktest2sles10" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -448,7 +448,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-dktest1sles10" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -472,10 +472,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-dktest1sles10" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-dktest2sles10" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-order-instance.exp b/pengine/test10/clone-order-instance.exp
index dd277ae..f6c51de 100644
--- a/pengine/test10/clone-order-instance.exp
+++ b/pengine/test10/clone-order-instance.exp
@@ -111,7 +111,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -126,7 +126,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -147,10 +147,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-alice.demo" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-bob.demo" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/clone-order-primitive.exp b/pengine/test10/clone-order-primitive.exp
index aefaf50..e46f1fc 100644
--- a/pengine/test10/clone-order-primitive.exp
+++ b/pengine/test10/clone-order-primitive.exp
@@ -66,7 +66,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="pcw2709.see.ed.ac.uk" on_node_uuid="pcw2709.see.ed.ac.uk">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-pcw2709.see.ed.ac.uk" on_node="pcw2709.see.ed.ac.uk" on_node_uuid="pcw2709.see.ed.ac.uk">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -74,7 +74,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="pcw2688.see.ed.ac.uk" on_node_uuid="pcw2688.see.ed.ac.uk">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcw2688.see.ed.ac.uk" on_node="pcw2688.see.ed.ac.uk" on_node_uuid="pcw2688.see.ed.ac.uk">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -82,7 +82,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="pcw2059.see.ed.ac.uk" on_node_uuid="pcw2059.see.ed.ac.uk">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcw2059.see.ed.ac.uk" on_node="pcw2059.see.ed.ac.uk" on_node_uuid="pcw2059.see.ed.ac.uk">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="pcw2058.see.ed.ac.uk" on_node_uuid="pcw2058.see.ed.ac.uk">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcw2058.see.ed.ac.uk" on_node="pcw2058.see.ed.ac.uk" on_node_uuid="pcw2058.see.ed.ac.uk">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/coloc-group.exp b/pengine/test10/coloc-group.exp
index f6c95f0..04b3b49 100644
--- a/pengine/test10/coloc-group.exp
+++ b/pengine/test10/coloc-group.exp
@@ -119,7 +119,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -137,7 +137,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -155,7 +155,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -179,13 +179,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/coloc-list.exp b/pengine/test10/coloc-list.exp
index 673c021..ca9d78e 100644
--- a/pengine/test10/coloc-list.exp
+++ b/pengine/test10/coloc-list.exp
@@ -139,7 +139,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -160,7 +160,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -178,7 +178,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -205,13 +205,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/coloc-loop.exp b/pengine/test10/coloc-loop.exp
index 12e86a2..1b50bad 100644
--- a/pengine/test10/coloc-loop.exp
+++ b/pengine/test10/coloc-loop.exp
@@ -121,7 +121,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -139,7 +139,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -181,13 +181,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/coloc-many-one.exp b/pengine/test10/coloc-many-one.exp
index 0dca637..e8503a4 100644
--- a/pengine/test10/coloc-many-one.exp
+++ b/pengine/test10/coloc-many-one.exp
@@ -121,7 +121,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -139,7 +139,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -181,13 +181,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/colocate-primitive-with-clone.exp b/pengine/test10/colocate-primitive-with-clone.exp
index 2dacc06..44fac10 100644
--- a/pengine/test10/colocate-primitive-with-clone.exp
+++ b/pengine/test10/colocate-primitive-with-clone.exp
@@ -133,7 +133,7 @@
</synapse>
<synapse id="9">
<action_set>
- <crm_event id="191" operation="do_shutdown" operation_key="do_shutdown" on_node="srv01" on_node_uuid="srv01">
+ <crm_event id="191" operation="do_shutdown" operation_key="do_shutdown-srv01" on_node="srv01" on_node_uuid="srv01">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/comments.exp b/pengine/test10/comments.exp
index 1ad8819..5d6abb2 100644
--- a/pengine/test10/comments.exp
+++ b/pengine/test10/comments.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,7 +78,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/container-1.exp b/pengine/test10/container-1.exp
index 522b0f1..e252625 100644
--- a/pengine/test10/container-1.exp
+++ b/pengine/test10/container-1.exp
@@ -97,7 +97,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -109,7 +109,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -127,10 +127,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/container-2.exp b/pengine/test10/container-2.exp
index c5f9e9e..4b1532b 100644
--- a/pengine/test10/container-2.exp
+++ b/pengine/test10/container-2.exp
@@ -119,7 +119,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -127,7 +127,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/container-3.exp b/pengine/test10/container-3.exp
index 3c2703a..e1fb4d9 100644
--- a/pengine/test10/container-3.exp
+++ b/pengine/test10/container-3.exp
@@ -104,7 +104,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -112,7 +112,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/container-4.exp b/pengine/test10/container-4.exp
index d1da381..ed9bafa 100644
--- a/pengine/test10/container-4.exp
+++ b/pengine/test10/container-4.exp
@@ -119,7 +119,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -127,7 +127,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/container-group-1.exp b/pengine/test10/container-group-1.exp
index b14aa4c..af8a7d9 100644
--- a/pengine/test10/container-group-1.exp
+++ b/pengine/test10/container-group-1.exp
@@ -144,7 +144,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -174,10 +174,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/container-group-2.exp b/pengine/test10/container-group-2.exp
index ce32cc3..5acdcbc 100644
--- a/pengine/test10/container-group-2.exp
+++ b/pengine/test10/container-group-2.exp
@@ -207,7 +207,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -215,7 +215,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/container-group-3.exp b/pengine/test10/container-group-3.exp
index 96d99c6..d07c9cb 100644
--- a/pengine/test10/container-group-3.exp
+++ b/pengine/test10/container-group-3.exp
@@ -160,7 +160,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -168,7 +168,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/container-group-4.exp b/pengine/test10/container-group-4.exp
index 6128599..7970a76 100644
--- a/pengine/test10/container-group-4.exp
+++ b/pengine/test10/container-group-4.exp
@@ -207,7 +207,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -215,7 +215,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/date-1.exp b/pengine/test10/date-1.exp
index 2a64721..eba26f2 100644
--- a/pengine/test10/date-1.exp
+++ b/pengine/test10/date-1.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/domain.exp b/pengine/test10/domain.exp
index 3d9eb9a..1228dde 100644
--- a/pengine/test10/domain.exp
+++ b/pengine/test10/domain.exp
@@ -50,7 +50,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="puma4" on_node_uuid="puma4">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-puma4" on_node="puma4" on_node_uuid="puma4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,7 +62,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="puma3">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="puma3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -74,7 +74,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma2" on_node_uuid="puma2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma2" on_node="puma2" on_node_uuid="puma2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -86,7 +86,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="puma1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="puma1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -104,16 +104,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="puma1" on_node_uuid="puma1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-puma1" on_node="puma1" on_node_uuid="puma1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="puma2" on_node_uuid="puma2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-puma2" on_node="puma2" on_node_uuid="puma2"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="puma3" on_node_uuid="puma3"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-puma3" on_node="puma3" on_node_uuid="puma3"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="puma4" on_node_uuid="puma4"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-puma4" on_node="puma4" on_node_uuid="puma4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group-fail.exp b/pengine/test10/group-fail.exp
index cf4c6eb..79ae80a 100644
--- a/pengine/test10/group-fail.exp
+++ b/pengine/test10/group-fail.exp
@@ -159,7 +159,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -167,7 +167,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/group-unmanaged-stopped.exp b/pengine/test10/group-unmanaged-stopped.exp
new file mode 100644
index 0000000..3ea67ca
--- /dev/null
+++ b/pengine/test10/group-unmanaged-stopped.exp
@@ -0,0 +1,66 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <pseudo_event id="15" operation="stopped" operation_key="group-1_stopped_0">
+ <attributes CRM_meta_timeout="90000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="11" operation="stop" operation_key="r192.168.122.115_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="14" operation="stop" operation_key="group-1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <pseudo_event id="14" operation="stop" operation_key="group-1_stop_0">
+ <attributes CRM_meta_timeout="90000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="11" operation="stop" operation_key="r192.168.122.115_stop_0" on_node="pcmk-1" on_node_uuid="1">
+ <primitive id="r192.168.122.115" class="ocf" provider="heartbeat" type="IPaddr2"/>
+ <attributes CRM_meta_timeout="90000" cidr_netmask="32" ip="192.168.122.115"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="14" operation="stop" operation_key="group-1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3" priority="1000000">
+ <action_set>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="4" priority="1000000">
+ <action_set>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <pseudo_event id="4" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="11" operation="stop" operation_key="r192.168.122.115_stop_0" on_node="pcmk-1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/group-unmanaged.exp b/pengine/test10/group-unmanaged.exp
new file mode 100644
index 0000000..9ccb828
--- /dev/null
+++ b/pengine/test10/group-unmanaged.exp
@@ -0,0 +1,18 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1" transition_id="0">
+ <synapse id="0" priority="1000000">
+ <action_set>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="1" priority="1000000">
+ <action_set>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/group1.exp b/pengine/test10/group1.exp
index e0c19fe..45e2fcc 100644
--- a/pengine/test10/group1.exp
+++ b/pengine/test10/group1.exp
@@ -138,7 +138,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -180,10 +180,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group10.exp b/pengine/test10/group10.exp
index 4285683..7fab8b3 100644
--- a/pengine/test10/group10.exp
+++ b/pengine/test10/group10.exp
@@ -291,7 +291,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="26" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -306,7 +306,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -321,7 +321,7 @@
</synapse>
<synapse id="24" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -336,7 +336,7 @@
</synapse>
<synapse id="25" priority="1000000">
<action_set>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -360,16 +360,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="26" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group11.exp b/pengine/test10/group11.exp
index 5c24675..b316b01 100644
--- a/pengine/test10/group11.exp
+++ b/pengine/test10/group11.exp
@@ -68,7 +68,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/group15.exp b/pengine/test10/group15.exp
index 421cd86..47a744a 100644
--- a/pengine/test10/group15.exp
+++ b/pengine/test10/group15.exp
@@ -192,7 +192,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -219,7 +219,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -252,10 +252,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group2.exp b/pengine/test10/group2.exp
index 061798d..7df6735 100644
--- a/pengine/test10/group2.exp
+++ b/pengine/test10/group2.exp
@@ -207,7 +207,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -231,7 +231,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -261,10 +261,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group3.exp b/pengine/test10/group3.exp
index 7cb477e..7cf2962 100644
--- a/pengine/test10/group3.exp
+++ b/pengine/test10/group3.exp
@@ -279,7 +279,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -306,7 +306,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -339,10 +339,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group4.exp b/pengine/test10/group4.exp
index b6b275e..207a905 100644
--- a/pengine/test10/group4.exp
+++ b/pengine/test10/group4.exp
@@ -46,7 +46,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -54,7 +54,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -84,10 +84,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group5.exp b/pengine/test10/group5.exp
index 920af4d..fa85bbe 100644
--- a/pengine/test10/group5.exp
+++ b/pengine/test10/group5.exp
@@ -296,7 +296,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -320,7 +320,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -334,10 +334,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group6.exp b/pengine/test10/group6.exp
index 40d149f..d71f695 100644
--- a/pengine/test10/group6.exp
+++ b/pengine/test10/group6.exp
@@ -420,7 +420,7 @@
</synapse>
<synapse id="26" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -447,7 +447,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -461,10 +461,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group7.exp b/pengine/test10/group7.exp
index 18abb01..4834e86 100644
--- a/pengine/test10/group7.exp
+++ b/pengine/test10/group7.exp
@@ -373,7 +373,7 @@
</synapse>
<synapse id="32" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="uuid3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -403,7 +403,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -433,7 +433,7 @@
</synapse>
<synapse id="34" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -469,13 +469,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="uuid3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group8.exp b/pengine/test10/group8.exp
index 6700350..c4887dd 100644
--- a/pengine/test10/group8.exp
+++ b/pengine/test10/group8.exp
@@ -160,7 +160,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -196,7 +196,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/group9.exp b/pengine/test10/group9.exp
index cf8dfea..650dfab 100644
--- a/pengine/test10/group9.exp
+++ b/pengine/test10/group9.exp
@@ -384,7 +384,7 @@
</synapse>
<synapse id="26" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -417,7 +417,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -431,10 +431,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/honor_stonith_rsc_order1.exp b/pengine/test10/honor_stonith_rsc_order1.exp
index 66a401b..7dd0ffb 100644
--- a/pengine/test10/honor_stonith_rsc_order1.exp
+++ b/pengine/test10/honor_stonith_rsc_order1.exp
@@ -123,7 +123,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -147,7 +147,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/honor_stonith_rsc_order2.exp b/pengine/test10/honor_stonith_rsc_order2.exp
index c4b0ee2..2ceba4a 100644
--- a/pengine/test10/honor_stonith_rsc_order2.exp
+++ b/pengine/test10/honor_stonith_rsc_order2.exp
@@ -185,7 +185,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -215,7 +215,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/honor_stonith_rsc_order3.exp b/pengine/test10/honor_stonith_rsc_order3.exp
index 8c0973a..780b1ba 100644
--- a/pengine/test10/honor_stonith_rsc_order3.exp
+++ b/pengine/test10/honor_stonith_rsc_order3.exp
@@ -212,7 +212,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -242,7 +242,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/honor_stonith_rsc_order4.exp b/pengine/test10/honor_stonith_rsc_order4.exp
index 6ddf8f9..4bf90b1 100644
--- a/pengine/test10/honor_stonith_rsc_order4.exp
+++ b/pengine/test10/honor_stonith_rsc_order4.exp
@@ -70,7 +70,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -94,7 +94,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ignore_stonith_rsc_order1.exp b/pengine/test10/ignore_stonith_rsc_order1.exp
index 883ba7a..099022c 100644
--- a/pengine/test10/ignore_stonith_rsc_order1.exp
+++ b/pengine/test10/ignore_stonith_rsc_order1.exp
@@ -48,7 +48,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -69,7 +69,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ignore_stonith_rsc_order2.exp b/pengine/test10/ignore_stonith_rsc_order2.exp
index f25ec5a..22850b9 100644
--- a/pengine/test10/ignore_stonith_rsc_order2.exp
+++ b/pengine/test10/ignore_stonith_rsc_order2.exp
@@ -105,7 +105,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -129,7 +129,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ignore_stonith_rsc_order3.exp b/pengine/test10/ignore_stonith_rsc_order3.exp
index 2ccc016..4feaa51 100644
--- a/pengine/test10/ignore_stonith_rsc_order3.exp
+++ b/pengine/test10/ignore_stonith_rsc_order3.exp
@@ -132,7 +132,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ignore_stonith_rsc_order4.exp b/pengine/test10/ignore_stonith_rsc_order4.exp
index a1a840d..f6967c1 100644
--- a/pengine/test10/ignore_stonith_rsc_order4.exp
+++ b/pengine/test10/ignore_stonith_rsc_order4.exp
@@ -159,7 +159,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -183,7 +183,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc0.exp b/pengine/test10/inc0.exp
index 71cced1..2d957aa 100644
--- a/pengine/test10/inc0.exp
+++ b/pengine/test10/inc0.exp
@@ -187,7 +187,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -211,7 +211,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -241,10 +241,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc1.exp b/pengine/test10/inc1.exp
index 6f5d759..172ae77 100644
--- a/pengine/test10/inc1.exp
+++ b/pengine/test10/inc1.exp
@@ -256,7 +256,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -286,7 +286,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -322,10 +322,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc11.exp b/pengine/test10/inc11.exp
index 54314c1..527d335 100644
--- a/pengine/test10/inc11.exp
+++ b/pengine/test10/inc11.exp
@@ -193,7 +193,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -211,7 +211,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -229,7 +229,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node0" on_node_uuid="uuid0">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node0" on_node="node0" on_node_uuid="uuid0">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -253,13 +253,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node0" on_node_uuid="uuid0"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node0" on_node="node0" on_node_uuid="uuid0"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc12.exp b/pengine/test10/inc12.exp
index 4fabf43..aa3f992 100644
--- a/pengine/test10/inc12.exp
+++ b/pengine/test10/inc12.exp
@@ -420,7 +420,7 @@
</synapse>
<synapse id="31">
<action_set>
- <crm_event id="80" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
+ <crm_event id="80" operation="do_shutdown" operation_key="do_shutdown-c001n07" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -441,7 +441,7 @@
</synapse>
<synapse id="32">
<action_set>
- <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
+ <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown-c001n06" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -462,7 +462,7 @@
</synapse>
<synapse id="33">
<action_set>
- <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
+ <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -486,7 +486,7 @@
</synapse>
<synapse id="34">
<action_set>
- <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
+ <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -510,31 +510,31 @@
</synapse>
<synapse id="35">
<action_set>
- <crm_event id="76" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
+ <crm_event id="76" operation="do_shutdown" operation_key="do_shutdown-c001n03" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
<inputs>
<trigger>
- <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
+ <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
</trigger>
<trigger>
- <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
+ <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown-c001n04" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
</trigger>
<trigger>
- <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+ <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
</trigger>
<trigger>
- <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
+ <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown-c001n06" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
</trigger>
<trigger>
- <crm_event id="80" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
+ <crm_event id="80" operation="do_shutdown" operation_key="do_shutdown-c001n07" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
</trigger>
</inputs>
</synapse>
<synapse id="36">
<action_set>
- <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
+ <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown-c001n02" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/inc2.exp b/pengine/test10/inc2.exp
index 82474dc..f3064aa 100644
--- a/pengine/test10/inc2.exp
+++ b/pengine/test10/inc2.exp
@@ -191,7 +191,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -221,7 +221,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc3.exp b/pengine/test10/inc3.exp
index 653c377..5e566bb 100644
--- a/pengine/test10/inc3.exp
+++ b/pengine/test10/inc3.exp
@@ -369,7 +369,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -393,7 +393,7 @@
</synapse>
<synapse id="28" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -423,10 +423,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc4.exp b/pengine/test10/inc4.exp
index 7b73210..6a9e648 100644
--- a/pengine/test10/inc4.exp
+++ b/pengine/test10/inc4.exp
@@ -384,7 +384,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -408,7 +408,7 @@
</synapse>
<synapse id="28" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -438,10 +438,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc5.exp b/pengine/test10/inc5.exp
index f8be6e4..3b0ad75 100644
--- a/pengine/test10/inc5.exp
+++ b/pengine/test10/inc5.exp
@@ -629,7 +629,7 @@
</synapse>
<synapse id="56" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -686,7 +686,7 @@
</synapse>
<synapse id="57" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -749,10 +749,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc6.exp b/pengine/test10/inc6.exp
index 5b347d0..3b4c8e2 100644
--- a/pengine/test10/inc6.exp
+++ b/pengine/test10/inc6.exp
@@ -438,7 +438,7 @@
</synapse>
<synapse id="32" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -446,7 +446,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/inc7.exp b/pengine/test10/inc7.exp
index ec1c6d2..2685678 100644
--- a/pengine/test10/inc7.exp
+++ b/pengine/test10/inc7.exp
@@ -560,7 +560,7 @@
</synapse>
<synapse id="48" priority="1000000">
<action_set>
- <rsc_op id="27" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3">
+ <rsc_op id="27" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="uuid3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -602,7 +602,7 @@
</synapse>
<synapse id="49" priority="1000000">
<action_set>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -644,7 +644,7 @@
</synapse>
<synapse id="50" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -692,13 +692,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
<trigger>
- <rsc_op id="27" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3"/>
+ <rsc_op id="27" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="uuid3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/inc8.exp b/pengine/test10/inc8.exp
index e6ac6de..03f3a4c 100644
--- a/pengine/test10/inc8.exp
+++ b/pengine/test10/inc8.exp
@@ -270,7 +270,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -312,7 +312,7 @@
</synapse>
<synapse id="28" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -360,10 +360,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/interleave-0.exp b/pengine/test10/interleave-0.exp
index d5523d5..8a3c701 100644
--- a/pengine/test10/interleave-0.exp
+++ b/pengine/test10/interleave-0.exp
@@ -1591,7 +1591,7 @@
</synapse>
<synapse id="164" priority="1000000">
<action_set>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1660,7 +1660,7 @@
</synapse>
<synapse id="165" priority="1000000">
<action_set>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1735,7 +1735,7 @@
</synapse>
<synapse id="166" priority="1000000">
<action_set>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1807,7 +1807,7 @@
</synapse>
<synapse id="167" priority="1000000">
<action_set>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1849,7 +1849,7 @@
</synapse>
<synapse id="168" priority="1000000">
<action_set>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1918,7 +1918,7 @@
</synapse>
<synapse id="169" priority="1000000">
<action_set>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1984,7 +1984,7 @@
</synapse>
<synapse id="170" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2041,7 +2041,7 @@
</synapse>
<synapse id="171" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2107,28 +2107,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/interleave-1.exp b/pengine/test10/interleave-1.exp
index d5523d5..8a3c701 100644
--- a/pengine/test10/interleave-1.exp
+++ b/pengine/test10/interleave-1.exp
@@ -1591,7 +1591,7 @@
</synapse>
<synapse id="164" priority="1000000">
<action_set>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1660,7 +1660,7 @@
</synapse>
<synapse id="165" priority="1000000">
<action_set>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1735,7 +1735,7 @@
</synapse>
<synapse id="166" priority="1000000">
<action_set>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1807,7 +1807,7 @@
</synapse>
<synapse id="167" priority="1000000">
<action_set>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1849,7 +1849,7 @@
</synapse>
<synapse id="168" priority="1000000">
<action_set>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1918,7 +1918,7 @@
</synapse>
<synapse id="169" priority="1000000">
<action_set>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1984,7 +1984,7 @@
</synapse>
<synapse id="170" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2041,7 +2041,7 @@
</synapse>
<synapse id="171" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2107,28 +2107,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/interleave-2.exp b/pengine/test10/interleave-2.exp
index d5523d5..8a3c701 100644
--- a/pengine/test10/interleave-2.exp
+++ b/pengine/test10/interleave-2.exp
@@ -1591,7 +1591,7 @@
</synapse>
<synapse id="164" priority="1000000">
<action_set>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1660,7 +1660,7 @@
</synapse>
<synapse id="165" priority="1000000">
<action_set>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1735,7 +1735,7 @@
</synapse>
<synapse id="166" priority="1000000">
<action_set>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1807,7 +1807,7 @@
</synapse>
<synapse id="167" priority="1000000">
<action_set>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1849,7 +1849,7 @@
</synapse>
<synapse id="168" priority="1000000">
<action_set>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1918,7 +1918,7 @@
</synapse>
<synapse id="169" priority="1000000">
<action_set>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1984,7 +1984,7 @@
</synapse>
<synapse id="170" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2041,7 +2041,7 @@
</synapse>
<synapse id="171" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2107,28 +2107,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/interleave-3.exp b/pengine/test10/interleave-3.exp
index d5523d5..8a3c701 100644
--- a/pengine/test10/interleave-3.exp
+++ b/pengine/test10/interleave-3.exp
@@ -1591,7 +1591,7 @@
</synapse>
<synapse id="164" priority="1000000">
<action_set>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1660,7 +1660,7 @@
</synapse>
<synapse id="165" priority="1000000">
<action_set>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1735,7 +1735,7 @@
</synapse>
<synapse id="166" priority="1000000">
<action_set>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1807,7 +1807,7 @@
</synapse>
<synapse id="167" priority="1000000">
<action_set>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1849,7 +1849,7 @@
</synapse>
<synapse id="168" priority="1000000">
<action_set>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1918,7 +1918,7 @@
</synapse>
<synapse id="169" priority="1000000">
<action_set>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1984,7 +1984,7 @@
</synapse>
<synapse id="170" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2041,7 +2041,7 @@
</synapse>
<synapse id="171" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2107,28 +2107,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="54" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="54" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="74" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="74" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="95" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="95" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="107" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="107" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="129" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="129" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="152" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="152" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/location-sets-templates.exp b/pengine/test10/location-sets-templates.exp
new file mode 100644
index 0000000..9ffacc6
--- /dev/null
+++ b/pengine/test10/location-sets-templates.exp
@@ -0,0 +1,257 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="17" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="18" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <rsc_op id="12" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="19" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc3" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="13" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc3" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc3" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <rsc_op id="20" operation="start" operation_key="rsc4_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc4" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <rsc_op id="14" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc4" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc4" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="12">
+ <action_set>
+ <rsc_op id="21" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc5" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <rsc_op id="15" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc5" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="14">
+ <action_set>
+ <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc5" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="15">
+ <action_set>
+ <rsc_op id="22" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc6" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="16">
+ <action_set>
+ <rsc_op id="16" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2">
+ <primitive id="rsc6" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="17">
+ <action_set>
+ <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc6" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="18" priority="1000000">
+ <action_set>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="12" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="13" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="14" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="15" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="16" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="19" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="20">
+ <action_set>
+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/managed-0.exp b/pengine/test10/managed-0.exp
index 67fcacb..40f48ed 100644
--- a/pengine/test10/managed-0.exp
+++ b/pengine/test10/managed-0.exp
@@ -730,7 +730,7 @@
</synapse>
<synapse id="81" priority="1000000">
<action_set>
- <rsc_op id="97" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="97" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -772,7 +772,7 @@
</synapse>
<synapse id="82" priority="1000000">
<action_set>
- <rsc_op id="82" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="82" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -823,7 +823,7 @@
</synapse>
<synapse id="83" priority="1000000">
<action_set>
- <rsc_op id="68" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="68" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -871,7 +871,7 @@
</synapse>
<synapse id="84" priority="1000000">
<action_set>
- <rsc_op id="64" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="64" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -889,7 +889,7 @@
</synapse>
<synapse id="85" priority="1000000">
<action_set>
- <rsc_op id="51" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="51" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -934,7 +934,7 @@
</synapse>
<synapse id="86" priority="1000000">
<action_set>
- <rsc_op id="39" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="39" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -976,7 +976,7 @@
</synapse>
<synapse id="87" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1009,7 +1009,7 @@
</synapse>
<synapse id="88" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1051,28 +1051,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="39" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="39" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="51" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="51" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="64" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="64" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="68" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="68" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="82" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="82" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="97" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="97" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/managed-1.exp b/pengine/test10/managed-1.exp
index 67fcacb..40f48ed 100644
--- a/pengine/test10/managed-1.exp
+++ b/pengine/test10/managed-1.exp
@@ -730,7 +730,7 @@
</synapse>
<synapse id="81" priority="1000000">
<action_set>
- <rsc_op id="97" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="97" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -772,7 +772,7 @@
</synapse>
<synapse id="82" priority="1000000">
<action_set>
- <rsc_op id="82" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="82" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -823,7 +823,7 @@
</synapse>
<synapse id="83" priority="1000000">
<action_set>
- <rsc_op id="68" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="68" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -871,7 +871,7 @@
</synapse>
<synapse id="84" priority="1000000">
<action_set>
- <rsc_op id="64" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="64" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -889,7 +889,7 @@
</synapse>
<synapse id="85" priority="1000000">
<action_set>
- <rsc_op id="51" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="51" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -934,7 +934,7 @@
</synapse>
<synapse id="86" priority="1000000">
<action_set>
- <rsc_op id="39" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="39" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -976,7 +976,7 @@
</synapse>
<synapse id="87" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1009,7 +1009,7 @@
</synapse>
<synapse id="88" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1051,28 +1051,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="39" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="39" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="51" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="51" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="64" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="64" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="68" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="68" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="82" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="82" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="97" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="97" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/managed-2.exp b/pengine/test10/managed-2.exp
index 59dcdaf..5020993 100644
--- a/pengine/test10/managed-2.exp
+++ b/pengine/test10/managed-2.exp
@@ -1036,7 +1036,7 @@
</synapse>
<synapse id="115" priority="1000000">
<action_set>
- <rsc_op id="119" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
+ <rsc_op id="119" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1090,7 +1090,7 @@
</synapse>
<synapse id="116" priority="1000000">
<action_set>
- <rsc_op id="102" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="102" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1147,7 +1147,7 @@
</synapse>
<synapse id="117" priority="1000000">
<action_set>
- <rsc_op id="85" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
+ <rsc_op id="85" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1204,7 +1204,7 @@
</synapse>
<synapse id="118" priority="1000000">
<action_set>
- <rsc_op id="73" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
+ <rsc_op id="73" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1246,7 +1246,7 @@
</synapse>
<synapse id="119" priority="1000000">
<action_set>
- <rsc_op id="56" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
+ <rsc_op id="56" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1303,7 +1303,7 @@
</synapse>
<synapse id="120" priority="1000000">
<action_set>
- <rsc_op id="40" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
+ <rsc_op id="40" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1357,7 +1357,7 @@
</synapse>
<synapse id="121" priority="1000000">
<action_set>
- <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="26" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1405,7 +1405,7 @@
</synapse>
<synapse id="122" priority="1000000">
<action_set>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -1459,28 +1459,28 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="26" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="40" operation="probe_complete" operation_key="probe_complete" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+ <rsc_op id="40" operation="probe_complete" operation_key="probe_complete-c001n04" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
</trigger>
<trigger>
- <rsc_op id="56" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
+ <rsc_op id="56" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
</trigger>
<trigger>
- <rsc_op id="73" operation="probe_complete" operation_key="probe_complete" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+ <rsc_op id="73" operation="probe_complete" operation_key="probe_complete-c001n06" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
</trigger>
<trigger>
- <rsc_op id="85" operation="probe_complete" operation_key="probe_complete" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+ <rsc_op id="85" operation="probe_complete" operation_key="probe_complete-c001n07" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
</trigger>
<trigger>
- <rsc_op id="102" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="102" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="119" operation="probe_complete" operation_key="probe_complete" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+ <rsc_op id="119" operation="probe_complete" operation_key="probe_complete-c001n09" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-0.exp b/pengine/test10/master-0.exp
index 695f274..a1423de 100644
--- a/pengine/test10/master-0.exp
+++ b/pengine/test10/master-0.exp
@@ -187,7 +187,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -211,7 +211,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -241,10 +241,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-1.exp b/pengine/test10/master-1.exp
index d5e0def..cb2b4a3 100644
--- a/pengine/test10/master-1.exp
+++ b/pengine/test10/master-1.exp
@@ -227,7 +227,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -251,7 +251,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -281,10 +281,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-10.exp b/pengine/test10/master-10.exp
index c34c62c..45b3817 100644
--- a/pengine/test10/master-10.exp
+++ b/pengine/test10/master-10.exp
@@ -603,7 +603,7 @@
</synapse>
<synapse id="43" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -627,7 +627,7 @@
</synapse>
<synapse id="44" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -657,10 +657,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-11.exp b/pengine/test10/master-11.exp
index ae85aa6..33d3ede 100644
--- a/pengine/test10/master-11.exp
+++ b/pengine/test10/master-11.exp
@@ -166,7 +166,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -184,7 +184,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -208,10 +208,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-2.exp b/pengine/test10/master-2.exp
index ef4095b..6bb01f6 100644
--- a/pengine/test10/master-2.exp
+++ b/pengine/test10/master-2.exp
@@ -524,7 +524,7 @@
</synapse>
<synapse id="39" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -548,7 +548,7 @@
</synapse>
<synapse id="40" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -578,10 +578,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-3.exp b/pengine/test10/master-3.exp
index d5e0def..cb2b4a3 100644
--- a/pengine/test10/master-3.exp
+++ b/pengine/test10/master-3.exp
@@ -227,7 +227,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -251,7 +251,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -281,10 +281,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-4.exp b/pengine/test10/master-4.exp
index a1e61b3..8ec3c39 100644
--- a/pengine/test10/master-4.exp
+++ b/pengine/test10/master-4.exp
@@ -302,7 +302,7 @@
</synapse>
<synapse id="32" priority="1000000">
<action_set>
- <rsc_op id="45" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="45" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -335,7 +335,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -365,7 +365,7 @@
</synapse>
<synapse id="34" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -392,7 +392,7 @@
</synapse>
<synapse id="35" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -425,16 +425,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="45" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="45" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-5.exp b/pengine/test10/master-5.exp
index 0196883..1312668 100644
--- a/pengine/test10/master-5.exp
+++ b/pengine/test10/master-5.exp
@@ -244,7 +244,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="45" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="45" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -277,7 +277,7 @@
</synapse>
<synapse id="28" priority="1000000">
<action_set>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -307,7 +307,7 @@
</synapse>
<synapse id="29" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -334,7 +334,7 @@
</synapse>
<synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -367,16 +367,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="37" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="37" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="45" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="45" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-6.exp b/pengine/test10/master-6.exp
index 381bfd5..b9cdb41 100644
--- a/pengine/test10/master-6.exp
+++ b/pengine/test10/master-6.exp
@@ -217,7 +217,7 @@
</synapse>
<synapse id="24" priority="1000000">
<action_set>
- <rsc_op id="43" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="43" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -250,7 +250,7 @@
</synapse>
<synapse id="25" priority="1000000">
<action_set>
- <rsc_op id="36" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="36" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -277,7 +277,7 @@
</synapse>
<synapse id="26" priority="1000000">
<action_set>
- <rsc_op id="31" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="31" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -298,7 +298,7 @@
</synapse>
<synapse id="27" priority="1000000">
<action_set>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -331,16 +331,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="31" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="31" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="36" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="36" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="43" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="43" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-7.exp b/pengine/test10/master-7.exp
index 4fba172..3f45706 100644
--- a/pengine/test10/master-7.exp
+++ b/pengine/test10/master-7.exp
@@ -647,7 +647,7 @@
</synapse>
<synapse id="47" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -668,7 +668,7 @@
</synapse>
<synapse id="48" priority="1000000">
<action_set>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -692,7 +692,7 @@
</synapse>
<synapse id="49" priority="1000000">
<action_set>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -719,13 +719,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="19" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-8.exp b/pengine/test10/master-8.exp
index c0cd853..26ba512 100644
--- a/pengine/test10/master-8.exp
+++ b/pengine/test10/master-8.exp
@@ -703,7 +703,7 @@
</synapse>
<synapse id="51" priority="1000000">
<action_set>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -724,7 +724,7 @@
</synapse>
<synapse id="52" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -751,7 +751,7 @@
</synapse>
<synapse id="53" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -778,13 +778,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="30" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="30" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-9.exp b/pengine/test10/master-9.exp
index 333f272..989f087 100644
--- a/pengine/test10/master-9.exp
+++ b/pengine/test10/master-9.exp
@@ -190,7 +190,7 @@
</synapse>
<synapse id="20">
<action_set>
- <crm_event id="66" operation="do_shutdown" operation_key="do_shutdown" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
+ <crm_event id="66" operation="do_shutdown" operation_key="do_shutdown-ibm1" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -202,7 +202,7 @@
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b">
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-va1" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -238,7 +238,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-ibm1" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -277,10 +277,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-ibm1" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/>
</trigger>
<trigger>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-va1" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-depend.exp b/pengine/test10/master-depend.exp
index 87d7d68..d9347f2 100644
--- a/pengine/test10/master-depend.exp
+++ b/pengine/test10/master-depend.exp
@@ -225,7 +225,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="vbox4" on_node_uuid="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-vbox4" on_node="vbox4" on_node_uuid="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -261,7 +261,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="vbox4" on_node_uuid="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-vbox4" on_node="vbox4" on_node_uuid="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-ordering.exp b/pengine/test10/master-ordering.exp
index 365bb7b..de4fe7e 100644
--- a/pengine/test10/master-ordering.exp
+++ b/pengine/test10/master-ordering.exp
@@ -446,7 +446,7 @@
</synapse>
<synapse id="37" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-webcluster01" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -500,7 +500,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-webcluster01" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-probed-score.exp b/pengine/test10/master-probed-score.exp
index 0992921..be0cf84 100644
--- a/pengine/test10/master-probed-score.exp
+++ b/pengine/test10/master-probed-score.exp
@@ -2752,7 +2752,7 @@
</synapse>
<synapse id="190" priority="1000000">
<action_set>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="orestes-corosync.nevis.columbia.edu" on_node_uuid="orestes-corosync.nevis.columbia.edu">
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-orestes-corosync.nevis.columbia.edu" on_node="orestes-corosync.nevis.columbia.edu" on_node_uuid="orestes-corosync.nevis.columbia.edu">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2818,7 +2818,7 @@
</synapse>
<synapse id="191" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hypatia-corosync.nevis.columbia.edu" on_node_uuid="hypatia-corosync.nevis.columbia.edu">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hypatia-corosync.nevis.columbia.edu" on_node="hypatia-corosync.nevis.columbia.edu" on_node_uuid="hypatia-corosync.nevis.columbia.edu">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -2893,10 +2893,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hypatia-corosync.nevis.columbia.edu" on_node_uuid="hypatia-corosync.nevis.columbia.edu"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hypatia-corosync.nevis.columbia.edu" on_node="hypatia-corosync.nevis.columbia.edu" on_node_uuid="hypatia-corosync.nevis.columbia.edu"/>
</trigger>
<trigger>
- <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="orestes-corosync.nevis.columbia.edu" on_node_uuid="orestes-corosync.nevis.columbia.edu"/>
+ <rsc_op id="24" operation="probe_complete" operation_key="probe_complete-orestes-corosync.nevis.columbia.edu" on_node="orestes-corosync.nevis.columbia.edu" on_node_uuid="orestes-corosync.nevis.columbia.edu"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/master-reattach.exp b/pengine/test10/master-reattach.exp
index afe989b..edf107e 100644
--- a/pengine/test10/master-reattach.exp
+++ b/pengine/test10/master-reattach.exp
@@ -46,7 +46,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="dktest2" on_node_uuid="f430bc66-3388-4b7d-9e99-24fb02855f54">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-dktest2" on_node="dktest2" on_node_uuid="f430bc66-3388-4b7d-9e99-24fb02855f54">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -54,7 +54,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="dktest1" on_node_uuid="c738bee8-591f-4653-aaad-20a961923f25">
+ <rsc_op id="2" operation="probe_complete" operation_key="probe_complete-dktest1" on_node="dktest1" on_node_uuid="c738bee8-591f-4653-aaad-20a961923f25">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/master-stop.exp b/pengine/test10/master-stop.exp
new file mode 100644
index 0000000..5d9e4c1
--- /dev/null
+++ b/pengine/test10/master-stop.exp
@@ -0,0 +1,74 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="10" operation="stop" operation_key="dummy:2_stop_0" on_node="node3" on_node_uuid="3">
+ <primitive id="dummy" long-id="dummy:2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="13" operation="stop" operation_key="m_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1" priority="1000000">
+ <action_set>
+ <pseudo_event id="14" operation="stopped" operation_key="m_stopped_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="10" operation="stop" operation_key="dummy:2_stop_0" on_node="node3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="13" operation="stop" operation_key="m_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <pseudo_event id="13" operation="stop" operation_key="m_stop_0">
+ <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="3">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="4" priority="1000000">
+ <action_set>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="5" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="10" operation="stop" operation_key="dummy:2_stop_0" on_node="node3" on_node_uuid="3"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/master-unmanaged-monitor.exp b/pengine/test10/master-unmanaged-monitor.exp
index 2f7c2da..3f650a5 100644
--- a/pengine/test10/master-unmanaged-monitor.exp
+++ b/pengine/test10/master-unmanaged-monitor.exp
@@ -91,7 +91,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="pcmk-1">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="pcmk-1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -109,7 +109,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/migrate-1.exp b/pengine/test10/migrate-1.exp
index 9111b0f..7830a51 100644
--- a/pengine/test10/migrate-1.exp
+++ b/pengine/test10/migrate-1.exp
@@ -67,7 +67,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -79,7 +79,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -93,10 +93,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/migrate-2.exp b/pengine/test10/migrate-2.exp
index 3888892..cf7f123 100644
--- a/pengine/test10/migrate-2.exp
+++ b/pengine/test10/migrate-2.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/migrate-3.exp b/pengine/test10/migrate-3.exp
index 6c8b5af..6476943 100644
--- a/pengine/test10/migrate-3.exp
+++ b/pengine/test10/migrate-3.exp
@@ -39,7 +39,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -51,7 +51,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -65,10 +65,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/migrate-4.exp b/pengine/test10/migrate-4.exp
index 14ce94d..8cac495 100644
--- a/pengine/test10/migrate-4.exp
+++ b/pengine/test10/migrate-4.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/migrate-shutdown.exp b/pengine/test10/migrate-shutdown.exp
index b6a4365..e6d068a 100644
--- a/pengine/test10/migrate-shutdown.exp
+++ b/pengine/test10/migrate-shutdown.exp
@@ -325,7 +325,7 @@
</synapse>
<synapse id="25">
<action_set>
- <crm_event id="59" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-4" on_node_uuid="104">
+ <crm_event id="59" operation="do_shutdown" operation_key="do_shutdown-pcmk-4" on_node="pcmk-4" on_node_uuid="104">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -343,7 +343,7 @@
</synapse>
<synapse id="26">
<action_set>
- <crm_event id="58" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-3" on_node_uuid="103">
+ <crm_event id="58" operation="do_shutdown" operation_key="do_shutdown-pcmk-3" on_node="pcmk-3" on_node_uuid="103">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -355,7 +355,7 @@
</synapse>
<synapse id="27">
<action_set>
- <crm_event id="57" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-2" on_node_uuid="102">
+ <crm_event id="57" operation="do_shutdown" operation_key="do_shutdown-pcmk-2" on_node="pcmk-2" on_node_uuid="102">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -385,7 +385,7 @@
</synapse>
<synapse id="28">
<action_set>
- <crm_event id="56" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-1" on_node_uuid="101">
+ <crm_event id="56" operation="do_shutdown" operation_key="do_shutdown-pcmk-1" on_node="pcmk-1" on_node_uuid="101">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -406,13 +406,13 @@
<rsc_op id="43" operation="stop" operation_key="stateful-1:2_stop_0" internal_operation_key="stateful-1:0_stop_0" on_node="pcmk-1" on_node_uuid="101"/>
</trigger>
<trigger>
- <crm_event id="57" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-2" on_node_uuid="102"/>
+ <crm_event id="57" operation="do_shutdown" operation_key="do_shutdown-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
</trigger>
<trigger>
- <crm_event id="58" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-3" on_node_uuid="103"/>
+ <crm_event id="58" operation="do_shutdown" operation_key="do_shutdown-pcmk-3" on_node="pcmk-3" on_node_uuid="103"/>
</trigger>
<trigger>
- <crm_event id="59" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-4" on_node_uuid="104"/>
+ <crm_event id="59" operation="do_shutdown" operation_key="do_shutdown-pcmk-4" on_node="pcmk-4" on_node_uuid="104"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/migrate-start-complex.exp b/pengine/test10/migrate-start-complex.exp
index 7f9e3fa..33e54f6 100644
--- a/pengine/test10/migrate-start-complex.exp
+++ b/pengine/test10/migrate-start-complex.exp
@@ -241,7 +241,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="dom0-02" on_node_uuid="dom0-02">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-dom0-02" on_node="dom0-02" on_node_uuid="dom0-02">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -253,7 +253,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="dom0-01" on_node_uuid="dom0-01">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-dom0-01" on_node="dom0-01" on_node_uuid="dom0-01">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -271,10 +271,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="dom0-01" on_node_uuid="dom0-01"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-dom0-01" on_node="dom0-01" on_node_uuid="dom0-01"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="dom0-02" on_node_uuid="dom0-02"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-dom0-02" on_node="dom0-02" on_node_uuid="dom0-02"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/minimal.exp b/pengine/test10/minimal.exp
index 565452b..ce47557 100644
--- a/pengine/test10/minimal.exp
+++ b/pengine/test10/minimal.exp
@@ -69,7 +69,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -84,7 +84,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -105,10 +105,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/mon-rsc-1.exp b/pengine/test10/mon-rsc-1.exp
index 3b67915..c1cf031 100644
--- a/pengine/test10/mon-rsc-1.exp
+++ b/pengine/test10/mon-rsc-1.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -57,7 +57,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -75,10 +75,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/mon-rsc-2.exp b/pengine/test10/mon-rsc-2.exp
index 6a6fd07..317b84c 100644
--- a/pengine/test10/mon-rsc-2.exp
+++ b/pengine/test10/mon-rsc-2.exp
@@ -52,7 +52,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -60,7 +60,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,10 +78,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/mon-rsc-3.exp b/pengine/test10/mon-rsc-3.exp
index b32054f..6d93160 100644
--- a/pengine/test10/mon-rsc-3.exp
+++ b/pengine/test10/mon-rsc-3.exp
@@ -36,7 +36,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -48,7 +48,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/mon-rsc-4.exp b/pengine/test10/mon-rsc-4.exp
index 2abfdec..58a64f5 100644
--- a/pengine/test10/mon-rsc-4.exp
+++ b/pengine/test10/mon-rsc-4.exp
@@ -52,7 +52,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -60,7 +60,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,10 +78,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/multi1.exp b/pengine/test10/multi1.exp
index 58d9dbf..18fe162 100644
--- a/pengine/test10/multi1.exp
+++ b/pengine/test10/multi1.exp
@@ -35,7 +35,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -43,7 +43,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/node-maintenance-1.exp b/pengine/test10/node-maintenance-1.exp
index 3c73791..6a24c07 100644
--- a/pengine/test10/node-maintenance-1.exp
+++ b/pengine/test10/node-maintenance-1.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -27,7 +27,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/node-maintenance-2.exp b/pengine/test10/node-maintenance-2.exp
index 0156835..d8b15e4 100644
--- a/pengine/test10/node-maintenance-2.exp
+++ b/pengine/test10/node-maintenance-2.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -40,7 +40,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/notify-0.exp b/pengine/test10/notify-0.exp
index 3198a86..626fb59 100644
--- a/pengine/test10/notify-0.exp
+++ b/pengine/test10/notify-0.exp
@@ -97,7 +97,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -118,7 +118,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/notify-1.exp b/pengine/test10/notify-1.exp
index 8c290aa..ca02a84 100644
--- a/pengine/test10/notify-1.exp
+++ b/pengine/test10/notify-1.exp
@@ -263,7 +263,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -284,7 +284,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/notify-2.exp b/pengine/test10/notify-2.exp
index 8c290aa..ca02a84 100644
--- a/pengine/test10/notify-2.exp
+++ b/pengine/test10/notify-2.exp
@@ -263,7 +263,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -284,7 +284,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/notify-3.exp b/pengine/test10/notify-3.exp
index 1615df0..c5708dc 100644
--- a/pengine/test10/notify-3.exp
+++ b/pengine/test10/notify-3.exp
@@ -438,7 +438,7 @@
</synapse>
<synapse id="33" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -456,7 +456,7 @@
</synapse>
<synapse id="34" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -477,10 +477,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/novell-239082.exp b/pengine/test10/novell-239082.exp
index 3073f7f..538eda6 100644
--- a/pengine/test10/novell-239082.exp
+++ b/pengine/test10/novell-239082.exp
@@ -454,7 +454,7 @@
</synapse>
<synapse id="32">
<action_set>
- <crm_event id="37" operation="do_shutdown" operation_key="do_shutdown" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
+ <crm_event id="37" operation="do_shutdown" operation_key="do_shutdown-xen-1" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/novell-252693-2.exp b/pengine/test10/novell-252693-2.exp
index f30cf03..ca3c378 100644
--- a/pengine/test10/novell-252693-2.exp
+++ b/pengine/test10/novell-252693-2.exp
@@ -696,7 +696,7 @@
</synapse>
<synapse id="51" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -729,7 +729,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/novell-252693-3.exp b/pengine/test10/novell-252693-3.exp
index 48be681..6ebe9a7 100644
--- a/pengine/test10/novell-252693-3.exp
+++ b/pengine/test10/novell-252693-3.exp
@@ -800,7 +800,7 @@
</synapse>
<synapse id="58" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -833,7 +833,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/novell-252693.exp b/pengine/test10/novell-252693.exp
index 4ab727a..ca4b942 100644
--- a/pengine/test10/novell-252693.exp
+++ b/pengine/test10/novell-252693.exp
@@ -554,7 +554,7 @@
</synapse>
<synapse id="41">
<action_set>
- <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
+ <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown-node1" on_node="node1" on_node_uuid="3d8227f0-31dd-4801-b0db-987909d4a321">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
diff --git a/pengine/test10/obsolete-lrm-resource.exp b/pengine/test10/obsolete-lrm-resource.exp
index e56e556..0939b4f 100644
--- a/pengine/test10/obsolete-lrm-resource.exp
+++ b/pengine/test10/obsolete-lrm-resource.exp
@@ -58,7 +58,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -76,7 +76,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-0.exp b/pengine/test10/one-or-more-0.exp
index 315c596..01c59c7 100644
--- a/pengine/test10/one-or-more-0.exp
+++ b/pengine/test10/one-or-more-0.exp
@@ -98,7 +98,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -125,7 +125,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-1.exp b/pengine/test10/one-or-more-1.exp
index 30e68b2..900fc5d 100644
--- a/pengine/test10/one-or-more-1.exp
+++ b/pengine/test10/one-or-more-1.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-2.exp b/pengine/test10/one-or-more-2.exp
index d94fd9d..019b8d0 100644
--- a/pengine/test10/one-or-more-2.exp
+++ b/pengine/test10/one-or-more-2.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -109,7 +109,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-3.exp b/pengine/test10/one-or-more-3.exp
index 2070f51..09776cd 100644
--- a/pengine/test10/one-or-more-3.exp
+++ b/pengine/test10/one-or-more-3.exp
@@ -50,7 +50,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -77,7 +77,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-4.exp b/pengine/test10/one-or-more-4.exp
index 002fc27..2496808 100644
--- a/pengine/test10/one-or-more-4.exp
+++ b/pengine/test10/one-or-more-4.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -109,7 +109,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/one-or-more-5.exp b/pengine/test10/one-or-more-5.exp
index 67d1231..fe94627 100644
--- a/pengine/test10/one-or-more-5.exp
+++ b/pengine/test10/one-or-more-5.exp
@@ -116,7 +116,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -149,7 +149,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order-mandatory.exp b/pengine/test10/order-mandatory.exp
index 7aa18d2..166e578 100644
--- a/pengine/test10/order-mandatory.exp
+++ b/pengine/test10/order-mandatory.exp
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/order-optional-keyword.exp b/pengine/test10/order-optional-keyword.exp
index d398916..aa3da4e 100644
--- a/pengine/test10/order-optional-keyword.exp
+++ b/pengine/test10/order-optional-keyword.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/order-optional.exp b/pengine/test10/order-optional.exp
index d14157b..76126ad 100644
--- a/pengine/test10/order-optional.exp
+++ b/pengine/test10/order-optional.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/order-required.exp b/pengine/test10/order-required.exp
index 2d871fa..6fc0257 100644
--- a/pengine/test10/order-required.exp
+++ b/pengine/test10/order-required.exp
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/order-wrong-kind.exp b/pengine/test10/order-wrong-kind.exp
index 68796f8..426153d 100644
--- a/pengine/test10/order-wrong-kind.exp
+++ b/pengine/test10/order-wrong-kind.exp
@@ -35,7 +35,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/order1.exp b/pengine/test10/order1.exp
index 6db9031..d69e2f6 100644
--- a/pengine/test10/order1.exp
+++ b/pengine/test10/order1.exp
@@ -100,7 +100,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -118,7 +118,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -142,10 +142,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order2.exp b/pengine/test10/order2.exp
index 9041ba0..9eacda0 100644
--- a/pengine/test10/order2.exp
+++ b/pengine/test10/order2.exp
@@ -134,7 +134,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -155,7 +155,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -182,10 +182,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order3.exp b/pengine/test10/order3.exp
index 215b49c..0ce0585 100644
--- a/pengine/test10/order3.exp
+++ b/pengine/test10/order3.exp
@@ -171,7 +171,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -192,7 +192,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -206,10 +206,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order4.exp b/pengine/test10/order4.exp
index 6db9031..d69e2f6 100644
--- a/pengine/test10/order4.exp
+++ b/pengine/test10/order4.exp
@@ -100,7 +100,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -118,7 +118,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -142,10 +142,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order5.exp b/pengine/test10/order5.exp
index eceee4f..970f13a 100644
--- a/pengine/test10/order5.exp
+++ b/pengine/test10/order5.exp
@@ -189,7 +189,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -210,7 +210,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -237,10 +237,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order6.exp b/pengine/test10/order6.exp
index 7ebade6..e82ec71 100644
--- a/pengine/test10/order6.exp
+++ b/pengine/test10/order6.exp
@@ -189,7 +189,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -210,7 +210,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -237,10 +237,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/order7.exp b/pengine/test10/order7.exp
index cc7cf86..abfbe43 100644
--- a/pengine/test10/order7.exp
+++ b/pengine/test10/order7.exp
@@ -76,7 +76,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -103,7 +103,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ordered-set-basic-startup.exp b/pengine/test10/ordered-set-basic-startup.exp
index 4704f66..22d6dbb 100644
--- a/pengine/test10/ordered-set-basic-startup.exp
+++ b/pengine/test10/ordered-set-basic-startup.exp
@@ -68,7 +68,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -101,7 +101,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-fc16-builder" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/orphan-0.exp b/pengine/test10/orphan-0.exp
index afccffb..ca56f40 100644
--- a/pengine/test10/orphan-0.exp
+++ b/pengine/test10/orphan-0.exp
@@ -118,7 +118,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -139,7 +139,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -172,7 +172,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -196,16 +196,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/orphan-1.exp b/pengine/test10/orphan-1.exp
index b3a6470..6e76cba 100644
--- a/pengine/test10/orphan-1.exp
+++ b/pengine/test10/orphan-1.exp
@@ -162,7 +162,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -183,7 +183,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -201,7 +201,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -216,7 +216,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -240,16 +240,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="16" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/orphan-2.exp b/pengine/test10/orphan-2.exp
index ad9ad59..516422c 100644
--- a/pengine/test10/orphan-2.exp
+++ b/pengine/test10/orphan-2.exp
@@ -180,7 +180,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -201,7 +201,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -219,7 +219,7 @@
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -234,7 +234,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -276,16 +276,16 @@
<crm_event id="3" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/params-0.exp b/pengine/test10/params-0.exp
index 1489e3e..3b036ab 100644
--- a/pengine/test10/params-0.exp
+++ b/pengine/test10/params-0.exp
@@ -136,7 +136,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -178,7 +178,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -196,7 +196,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -223,16 +223,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/params-1.exp b/pengine/test10/params-1.exp
index 09470ab..6b6ef2d 100644
--- a/pengine/test10/params-1.exp
+++ b/pengine/test10/params-1.exp
@@ -205,7 +205,7 @@
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -226,7 +226,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -247,7 +247,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -265,7 +265,7 @@
</synapse>
<synapse id="24" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -292,16 +292,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp
index 7dd199b..fbac4a2 100644
--- a/pengine/test10/params-2.exp
+++ b/pengine/test10/params-2.exp
@@ -134,7 +134,7 @@
</synapse>
<synapse id="12">
<action_set>
- <crm_event id="19" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
+ <crm_event id="19" operation="do_shutdown" operation_key="do_shutdown-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -146,7 +146,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -176,7 +176,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -197,13 +197,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/params-4.exp b/pengine/test10/params-4.exp
index 50d9b7f..c5987e02 100644
--- a/pengine/test10/params-4.exp
+++ b/pengine/test10/params-4.exp
@@ -189,7 +189,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -210,7 +210,7 @@
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -231,7 +231,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -249,7 +249,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -276,16 +276,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/params-5.exp b/pengine/test10/params-5.exp
index 85736b0..01231e0 100644
--- a/pengine/test10/params-5.exp
+++ b/pengine/test10/params-5.exp
@@ -205,7 +205,7 @@
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -226,7 +226,7 @@
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -247,7 +247,7 @@
</synapse>
<synapse id="23" priority="1000000">
<action_set>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -265,7 +265,7 @@
</synapse>
<synapse id="24" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -292,16 +292,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="18" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/per-node-attrs.exp b/pengine/test10/per-node-attrs.exp
index 1e38557..aff6b4f 100644
--- a/pengine/test10/per-node-attrs.exp
+++ b/pengine/test10/per-node-attrs.exp
@@ -41,7 +41,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-3" on_node_uuid="103">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="103">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -53,7 +53,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-2" on_node_uuid="102">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="102">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -65,7 +65,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="101">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="101">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -83,13 +83,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="101"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="101"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-2" on_node_uuid="102"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-3" on_node_uuid="103"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="103"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/placement-capacity.exp b/pengine/test10/placement-capacity.exp
index f70c8c5..406d502 100644
--- a/pengine/test10/placement-capacity.exp
+++ b/pengine/test10/placement-capacity.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/placement-location.exp b/pengine/test10/placement-location.exp
index f70c8c5..406d502 100644
--- a/pengine/test10/placement-location.exp
+++ b/pengine/test10/placement-location.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/placement-priority.exp b/pengine/test10/placement-priority.exp
index c72759e..557f033 100644
--- a/pengine/test10/placement-priority.exp
+++ b/pengine/test10/placement-priority.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/placement-stickiness.exp b/pengine/test10/placement-stickiness.exp
index f70c8c5..406d502 100644
--- a/pengine/test10/placement-stickiness.exp
+++ b/pengine/test10/placement-stickiness.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/probe-0.exp b/pengine/test10/probe-0.exp
index c1310d9..562e855 100644
--- a/pengine/test10/probe-0.exp
+++ b/pengine/test10/probe-0.exp
@@ -160,7 +160,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-x32c48" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -172,7 +172,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-x32c47" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -190,10 +190,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-x32c47" on_node="x32c47" on_node_uuid="a1dbc8cc-4d33-41e7-a75a-cd4f93b26410"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-x32c48" on_node="x32c48" on_node_uuid="ca93fea5-67c9-473d-9ce0-7ed7fb823872"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/probe-1.exp b/pengine/test10/probe-1.exp
index a62f2f3..37d49e3 100644
--- a/pengine/test10/probe-1.exp
+++ b/pengine/test10/probe-1.exp
@@ -36,7 +36,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -54,7 +54,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c001n05" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/probe-4.exp b/pengine/test10/probe-4.exp
index 819dd5c..4f2d325 100644
--- a/pengine/test10/probe-4.exp
+++ b/pengine/test10/probe-4.exp
@@ -33,7 +33,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-pcmk-4" on_node="pcmk-4" on_node_uuid="pcmk-4"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/probe-timeout.exp b/pengine/test10/probe-timeout.exp
index 2458e7b..baf2440 100644
--- a/pengine/test10/probe-timeout.exp
+++ b/pengine/test10/probe-timeout.exp
@@ -115,7 +115,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -130,7 +130,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -151,10 +151,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-1.exp b/pengine/test10/quorum-1.exp
index f2de2c8..97dec69 100644
--- a/pengine/test10/quorum-1.exp
+++ b/pengine/test10/quorum-1.exp
@@ -79,7 +79,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -97,7 +97,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -115,10 +115,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-2.exp b/pengine/test10/quorum-2.exp
index ed60d5e..ac868ff 100644
--- a/pengine/test10/quorum-2.exp
+++ b/pengine/test10/quorum-2.exp
@@ -66,7 +66,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -84,7 +84,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -102,10 +102,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-3.exp b/pengine/test10/quorum-3.exp
index 175b11d..8ddd88c 100644
--- a/pengine/test10/quorum-3.exp
+++ b/pengine/test10/quorum-3.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -81,7 +81,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-4.exp b/pengine/test10/quorum-4.exp
index 3b90816..42ba483 100644
--- a/pengine/test10/quorum-4.exp
+++ b/pengine/test10/quorum-4.exp
@@ -36,7 +36,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -54,7 +54,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-5.exp b/pengine/test10/quorum-5.exp
index b2844a9..ee9e28e 100644
--- a/pengine/test10/quorum-5.exp
+++ b/pengine/test10/quorum-5.exp
@@ -106,7 +106,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -127,7 +127,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/quorum-6.exp b/pengine/test10/quorum-6.exp
index 685a514..0c46abe 100644
--- a/pengine/test10/quorum-6.exp
+++ b/pengine/test10/quorum-6.exp
@@ -125,7 +125,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -164,7 +164,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hadev2" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-1.exp b/pengine/test10/rec-node-1.exp
index f26fd66..2cc4595 100644
--- a/pengine/test10/rec-node-1.exp
+++ b/pengine/test10/rec-node-1.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -66,7 +66,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-10.exp b/pengine/test10/rec-node-10.exp
index 741bcf1..60ab810 100644
--- a/pengine/test10/rec-node-10.exp
+++ b/pengine/test10/rec-node-10.exp
@@ -28,7 +28,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp
index 173df21..f441ce8 100644
--- a/pengine/test10/rec-node-11.exp
+++ b/pengine/test10/rec-node-11.exp
@@ -245,7 +245,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -269,7 +269,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-12.exp b/pengine/test10/rec-node-12.exp
index 9732907..1ac908f 100644
--- a/pengine/test10/rec-node-12.exp
+++ b/pengine/test10/rec-node-12.exp
@@ -534,7 +534,7 @@
</synapse>
<synapse id="47" priority="1000000">
<action_set>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -570,7 +570,7 @@
</synapse>
<synapse id="48" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -606,7 +606,7 @@
</synapse>
<synapse id="49" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -648,13 +648,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="23" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-15.exp b/pengine/test10/rec-node-15.exp
index 3c79d65..e1330a6 100644
--- a/pengine/test10/rec-node-15.exp
+++ b/pengine/test10/rec-node-15.exp
@@ -465,7 +465,7 @@
</synapse>
<synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-sapcl02" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -477,7 +477,7 @@
</synapse>
<synapse id="31" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-sapcl01" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -495,10 +495,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-sapcl01" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
</trigger>
<trigger>
- <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-sapcl02" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-2.exp b/pengine/test10/rec-node-2.exp
index 901eded..fd04c37 100644
--- a/pengine/test10/rec-node-2.exp
+++ b/pengine/test10/rec-node-2.exp
@@ -266,7 +266,7 @@
</synapse>
<synapse id="20" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -302,7 +302,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-3.exp b/pengine/test10/rec-node-3.exp
index f26fd66..2cc4595 100644
--- a/pengine/test10/rec-node-3.exp
+++ b/pengine/test10/rec-node-3.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -66,7 +66,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp
index 1e98f4d..2cbfecb 100644
--- a/pengine/test10/rec-node-4.exp
+++ b/pengine/test10/rec-node-4.exp
@@ -132,7 +132,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-5.exp b/pengine/test10/rec-node-5.exp
index f26fd66..2cc4595 100644
--- a/pengine/test10/rec-node-5.exp
+++ b/pengine/test10/rec-node-5.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -66,7 +66,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp
index 1e98f4d..2cbfecb 100644
--- a/pengine/test10/rec-node-6.exp
+++ b/pengine/test10/rec-node-6.exp
@@ -132,7 +132,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp
index 1e98f4d..2cbfecb 100644
--- a/pengine/test10/rec-node-7.exp
+++ b/pengine/test10/rec-node-7.exp
@@ -132,7 +132,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-8.exp b/pengine/test10/rec-node-8.exp
index 00e58ef..1237a82 100644
--- a/pengine/test10/rec-node-8.exp
+++ b/pengine/test10/rec-node-8.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-node-9.exp b/pengine/test10/rec-node-9.exp
index e2192c8..9868f6f 100644
--- a/pengine/test10/rec-node-9.exp
+++ b/pengine/test10/rec-node-9.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -40,7 +40,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-0.exp b/pengine/test10/rec-rsc-0.exp
index 93bfb15..8caa0c0 100644
--- a/pengine/test10/rec-rsc-0.exp
+++ b/pengine/test10/rec-rsc-0.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -27,7 +27,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rec-rsc-1.exp b/pengine/test10/rec-rsc-1.exp
index 3825203..25030c6 100644
--- a/pengine/test10/rec-rsc-1.exp
+++ b/pengine/test10/rec-rsc-1.exp
@@ -39,7 +39,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -51,7 +51,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -65,10 +65,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-2.exp b/pengine/test10/rec-rsc-2.exp
index 7db7a0e..5f64c90 100644
--- a/pengine/test10/rec-rsc-2.exp
+++ b/pengine/test10/rec-rsc-2.exp
@@ -52,7 +52,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,10 +78,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-3.exp b/pengine/test10/rec-rsc-3.exp
index 80a6252..7faada9 100644
--- a/pengine/test10/rec-rsc-3.exp
+++ b/pengine/test10/rec-rsc-3.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-4.exp b/pengine/test10/rec-rsc-4.exp
index 78a90db..c186199 100644
--- a/pengine/test10/rec-rsc-4.exp
+++ b/pengine/test10/rec-rsc-4.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="2" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -36,10 +36,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="2" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
index 69a85d1..95a3558 100644
--- a/pengine/test10/rec-rsc-5.exp
+++ b/pengine/test10/rec-rsc-5.exp
@@ -132,7 +132,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -156,7 +156,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rec-rsc-6.exp b/pengine/test10/rec-rsc-6.exp
index 58d9dbf..18fe162 100644
--- a/pengine/test10/rec-rsc-6.exp
+++ b/pengine/test10/rec-rsc-6.exp
@@ -35,7 +35,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -43,7 +43,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rec-rsc-7.exp b/pengine/test10/rec-rsc-7.exp
index eb2335e..1454ff3 100644
--- a/pengine/test10/rec-rsc-7.exp
+++ b/pengine/test10/rec-rsc-7.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -27,7 +27,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rec-rsc-8.exp b/pengine/test10/rec-rsc-8.exp
index 8b8bce3..c53091f 100644
--- a/pengine/test10/rec-rsc-8.exp
+++ b/pengine/test10/rec-rsc-8.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="2" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rec-rsc-9.exp b/pengine/test10/rec-rsc-9.exp
index 4d0e70b..5a48606 100644
--- a/pengine/test10/rec-rsc-9.exp
+++ b/pengine/test10/rec-rsc-9.exp
@@ -194,7 +194,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/remote-startup-probes.exp b/pengine/test10/remote-startup-probes.exp
new file mode 100644
index 0000000..3c0f4e5
--- /dev/null
+++ b/pengine/test10/remote-startup-probes.exp
@@ -0,0 +1,214 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="20" operation="monitor" operation_key="remote1_monitor_60000" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="23" operation="monitor" operation_key="FAKE1_monitor_60000" on_node="18node2" on_node_uuid="2">
+ <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="22" operation="start" operation_key="FAKE1_start_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="22" operation="start" operation_key="FAKE1_start_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="21" operation="stop" operation_key="FAKE1_stop_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <rsc_op id="21" operation="stop" operation_key="FAKE1_stop_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="13" operation="monitor" operation_key="FAKE1_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE1" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="26" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="25" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="25" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="24" operation="stop" operation_key="FAKE2_stop_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="24" operation="stop" operation_key="FAKE2_stop_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <rsc_op id="14" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <rsc_op id="15" operation="monitor" operation_key="FAKE3_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE3" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <rsc_op id="16" operation="monitor" operation_key="FAKE4_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="12" priority="1000000">
+ <action_set>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-remote1" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="13" operation="monitor" operation_key="FAKE1_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="14" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="15" operation="monitor" operation_key="FAKE3_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="16" operation="monitor" operation_key="FAKE4_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-remote1" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="14">
+ <action_set>
+ <pseudo_event id="6" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="21" operation="stop" operation_key="FAKE1_stop_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="24" operation="stop" operation_key="FAKE2_stop_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/remote-startup.exp b/pengine/test10/remote-startup.exp
new file mode 100644
index 0000000..82fd243
--- /dev/null
+++ b/pengine/test10/remote-startup.exp
@@ -0,0 +1,246 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="18" operation="monitor" operation_key="shooter_monitor_60000" on_node="18node1" on_node_uuid="1">
+ <primitive id="shooter" class="stonith" type="fence_xvm"/>
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="17" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="17" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="shooter" class="stonith" type="fence_xvm"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="shooter" class="stonith" type="fence_xvm"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="19" operation="start" operation_key="fake_start_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <rsc_op id="15" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="9" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="6" operation="monitor" operation_key="fake_monitor_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="21" operation="monitor" operation_key="remote1_monitor_60000" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <rsc_op id="13" operation="monitor" operation_key="remote1_monitor_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <rsc_op id="10" operation="monitor" operation_key="remote1_monitor_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="12">
+ <action_set>
+ <rsc_op id="7" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="13" priority="1000000">
+ <action_set>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-remote1" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="15" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="14" priority="1000000">
+ <action_set>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-18node2" on_node="18node2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="13" operation="monitor" operation_key="remote1_monitor_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="15" priority="1000000">
+ <action_set>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-18node1" on_node="18node1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="9" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="10" operation="monitor" operation_key="remote1_monitor_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="16" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-18builder" on_node="18builder" on_node_uuid="5">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="monitor" operation_key="fake_monitor_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="17">
+ <action_set>
+ <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-18builder" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-18node1" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-18node2" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="18">
+ <action_set>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="14" operation="probe_complete" operation_key="probe_complete-remote1" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="19">
+ <action_set>
+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/reprobe-target_rc.exp b/pengine/test10/reprobe-target_rc.exp
index 9c09de7..f3b5a38 100644
--- a/pengine/test10/reprobe-target_rc.exp
+++ b/pengine/test10/reprobe-target_rc.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0">
<action_set>
- <rsc_op id="4" operation="probe_again" operation_key="probe_again" on_node="node-1" on_node_uuid="node-1">
+ <rsc_op id="4" operation="probe_again" operation_key="probe_again-node-1" on_node="node-1" on_node_uuid="node-1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1">
<action_set>
- <rsc_op id="3" operation="probe_again" operation_key="probe_again" on_node="node-0" on_node_uuid="node-0">
+ <rsc_op id="3" operation="probe_again" operation_key="probe_again-node-0" on_node="node-0" on_node_uuid="node-0">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rsc-maintenance.exp b/pengine/test10/rsc-maintenance.exp
new file mode 100644
index 0000000..146519c
--- /dev/null
+++ b/pengine/test10/rsc-maintenance.exp
@@ -0,0 +1,36 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="1" operation="cancel" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_call_id="3" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_operation="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="2" operation="cancel" operation_key="rsc2_monitor_10000" on_node="node1" on_node_uuid="node1">
+ <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
+ <attributes CRM_meta_call_id="3" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_operation="monitor" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2" priority="1000000">
+ <action_set>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3" priority="1000000">
+ <action_set>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+</transition_graph>
diff --git a/pengine/test10/rsc-sets-clone-1.exp b/pengine/test10/rsc-sets-clone-1.exp
index 7e441c3..c338d7a 100644
--- a/pengine/test10/rsc-sets-clone-1.exp
+++ b/pengine/test10/rsc-sets-clone-1.exp
@@ -476,7 +476,7 @@
</synapse>
<synapse id="36" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="sys3" on_node_uuid="sys3">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-sys3" on_node="sys3" on_node_uuid="sys3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -536,7 +536,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="sys3" on_node_uuid="sys3"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-sys3" on_node="sys3" on_node_uuid="sys3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc-sets-clone.exp b/pengine/test10/rsc-sets-clone.exp
index 042eff5..14d9ccb 100644
--- a/pengine/test10/rsc-sets-clone.exp
+++ b/pengine/test10/rsc-sets-clone.exp
@@ -88,7 +88,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -96,7 +96,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rsc-sets-master.exp b/pengine/test10/rsc-sets-master.exp
index 18609c9..f801973 100644
--- a/pengine/test10/rsc-sets-master.exp
+++ b/pengine/test10/rsc-sets-master.exp
@@ -205,7 +205,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -213,7 +213,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rsc-sets-seq-false.exp b/pengine/test10/rsc-sets-seq-false.exp
index 36109e4..76f5156 100644
--- a/pengine/test10/rsc-sets-seq-false.exp
+++ b/pengine/test10/rsc-sets-seq-false.exp
@@ -166,7 +166,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -174,7 +174,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rsc-sets-seq-true.exp b/pengine/test10/rsc-sets-seq-true.exp
index be82497..c37c9a9 100644
--- a/pengine/test10/rsc-sets-seq-true.exp
+++ b/pengine/test10/rsc-sets-seq-true.exp
@@ -168,7 +168,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -176,7 +176,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/rsc_dep1.exp b/pengine/test10/rsc_dep1.exp
index 9b61a44..96b998a 100644
--- a/pengine/test10/rsc_dep1.exp
+++ b/pengine/test10/rsc_dep1.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,7 +78,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep10.exp b/pengine/test10/rsc_dep10.exp
index a8f0bdf..727e20d 100644
--- a/pengine/test10/rsc_dep10.exp
+++ b/pengine/test10/rsc_dep10.exp
@@ -50,7 +50,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -65,7 +65,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -86,10 +86,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep2.exp b/pengine/test10/rsc_dep2.exp
index 9040091..0e861e6 100644
--- a/pengine/test10/rsc_dep2.exp
+++ b/pengine/test10/rsc_dep2.exp
@@ -81,7 +81,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,7 +99,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -123,10 +123,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep3.exp b/pengine/test10/rsc_dep3.exp
index 15bf782..4c78ffc 100644
--- a/pengine/test10/rsc_dep3.exp
+++ b/pengine/test10/rsc_dep3.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,7 +78,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep4.exp b/pengine/test10/rsc_dep4.exp
index 6b4eb82..1ad9e3e 100644
--- a/pengine/test10/rsc_dep4.exp
+++ b/pengine/test10/rsc_dep4.exp
@@ -110,7 +110,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -131,7 +131,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -152,10 +152,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep5.exp b/pengine/test10/rsc_dep5.exp
index 64ba084..9119f77 100644
--- a/pengine/test10/rsc_dep5.exp
+++ b/pengine/test10/rsc_dep5.exp
@@ -81,7 +81,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,7 +99,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -123,10 +123,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep7.exp b/pengine/test10/rsc_dep7.exp
index 8da56fe..64f1140 100644
--- a/pengine/test10/rsc_dep7.exp
+++ b/pengine/test10/rsc_dep7.exp
@@ -94,7 +94,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -112,7 +112,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -136,10 +136,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/rsc_dep8.exp b/pengine/test10/rsc_dep8.exp
index 9040091..0e861e6 100644
--- a/pengine/test10/rsc_dep8.exp
+++ b/pengine/test10/rsc_dep8.exp
@@ -81,7 +81,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,7 +99,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -123,10 +123,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/simple11.exp b/pengine/test10/simple11.exp
index 315a7fd..f94ad53 100644
--- a/pengine/test10/simple11.exp
+++ b/pengine/test10/simple11.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,7 +78,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/simple12.exp b/pengine/test10/simple12.exp
index 2b0a9f8..fda3c50 100644
--- a/pengine/test10/simple12.exp
+++ b/pengine/test10/simple12.exp
@@ -63,7 +63,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -78,7 +78,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -99,10 +99,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/simple2.exp b/pengine/test10/simple2.exp
index 99b81e7..b6e55a2 100644
--- a/pengine/test10/simple2.exp
+++ b/pengine/test10/simple2.exp
@@ -32,7 +32,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -62,10 +62,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="uuid1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="uuid2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/simple3.exp b/pengine/test10/simple3.exp
index 6e4c8cb..2ff55a8 100644
--- a/pengine/test10/simple3.exp
+++ b/pengine/test10/simple3.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/simple4.exp b/pengine/test10/simple4.exp
index 73c62e6..8702eab 100644
--- a/pengine/test10/simple4.exp
+++ b/pengine/test10/simple4.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/simple6.exp b/pengine/test10/simple6.exp
index 79d230d..785c04c 100644
--- a/pengine/test10/simple6.exp
+++ b/pengine/test10/simple6.exp
@@ -39,7 +39,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -57,7 +57,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/simple7.exp b/pengine/test10/simple7.exp
index ed0c1db..5cbf960 100644
--- a/pengine/test10/simple7.exp
+++ b/pengine/test10/simple7.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1">
<action_set>
- <crm_event id="6" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
+ <crm_event id="6" operation="do_shutdown" operation_key="do_shutdown-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -22,7 +22,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/simple8.exp b/pengine/test10/simple8.exp
index 0344648..4e8f09b 100644
--- a/pengine/test10/simple8.exp
+++ b/pengine/test10/simple8.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -58,7 +58,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,10 +72,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stonith-3.exp b/pengine/test10/stonith-3.exp
index 49e6e81..c4c1e32 100644
--- a/pengine/test10/stonith-3.exp
+++ b/pengine/test10/stonith-3.exp
@@ -137,7 +137,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-rh5node2" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -158,7 +158,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-rh5node2" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stonith-4.exp b/pengine/test10/stonith-4.exp
index 2cfffc0..2be0a96 100644
--- a/pengine/test10/stonith-4.exp
+++ b/pengine/test10/stonith-4.exp
@@ -79,13 +79,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-11" on_node_uuid="111"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcmk-11" on_node="pcmk-11" on_node_uuid="111"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-2" on_node_uuid="102"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="102"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-3" on_node_uuid="103"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-pcmk-3" on_node="pcmk-3" on_node_uuid="103"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stop-failure-no-fencing.exp b/pengine/test10/stop-failure-no-fencing.exp
index e9d94b8..52fe598 100644
--- a/pengine/test10/stop-failure-no-fencing.exp
+++ b/pengine/test10/stop-failure-no-fencing.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-2" on_node_uuid="102">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-pcmk-2" on_node="pcmk-2" on_node_uuid="102">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stop-failure-with-fencing.exp b/pengine/test10/stop-failure-with-fencing.exp
index 335ac37..8a467b4 100644
--- a/pengine/test10/stop-failure-with-fencing.exp
+++ b/pengine/test10/stop-failure-with-fencing.exp
@@ -72,7 +72,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="101">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="101">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="pcmk-1" on_node_uuid="101"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-pcmk-1" on_node="pcmk-1" on_node_uuid="101"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stopped-monitor-00.exp b/pengine/test10/stopped-monitor-00.exp
index 2788366..c27f870 100644
--- a/pengine/test10/stopped-monitor-00.exp
+++ b/pengine/test10/stopped-monitor-00.exp
@@ -58,7 +58,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -70,7 +70,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -88,10 +88,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stopped-monitor-01.exp b/pengine/test10/stopped-monitor-01.exp
index 04e44ee..5ca1496 100644
--- a/pengine/test10/stopped-monitor-01.exp
+++ b/pengine/test10/stopped-monitor-01.exp
@@ -36,7 +36,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-02.exp b/pengine/test10/stopped-monitor-02.exp
index 236d8ec..a735b0f 100644
--- a/pengine/test10/stopped-monitor-02.exp
+++ b/pengine/test10/stopped-monitor-02.exp
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -69,7 +69,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-03.exp b/pengine/test10/stopped-monitor-03.exp
index 9598ad7..92a5f57 100644
--- a/pengine/test10/stopped-monitor-03.exp
+++ b/pengine/test10/stopped-monitor-03.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-04.exp b/pengine/test10/stopped-monitor-04.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/stopped-monitor-04.exp
+++ b/pengine/test10/stopped-monitor-04.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-05.exp b/pengine/test10/stopped-monitor-05.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/stopped-monitor-05.exp
+++ b/pengine/test10/stopped-monitor-05.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-06.exp b/pengine/test10/stopped-monitor-06.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-06.exp
+++ b/pengine/test10/stopped-monitor-06.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-07.exp b/pengine/test10/stopped-monitor-07.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-07.exp
+++ b/pengine/test10/stopped-monitor-07.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-08.exp b/pengine/test10/stopped-monitor-08.exp
index d1da812..a291c47 100644
--- a/pengine/test10/stopped-monitor-08.exp
+++ b/pengine/test10/stopped-monitor-08.exp
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -69,7 +69,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-09.exp b/pengine/test10/stopped-monitor-09.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-09.exp
+++ b/pengine/test10/stopped-monitor-09.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-10.exp b/pengine/test10/stopped-monitor-10.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/stopped-monitor-10.exp
+++ b/pengine/test10/stopped-monitor-10.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-11.exp b/pengine/test10/stopped-monitor-11.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-11.exp
+++ b/pengine/test10/stopped-monitor-11.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-12.exp b/pengine/test10/stopped-monitor-12.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/stopped-monitor-12.exp
+++ b/pengine/test10/stopped-monitor-12.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-20.exp b/pengine/test10/stopped-monitor-20.exp
index 0d1c05e..d4a4076 100644
--- a/pengine/test10/stopped-monitor-20.exp
+++ b/pengine/test10/stopped-monitor-20.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -57,7 +57,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -75,10 +75,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stopped-monitor-21.exp b/pengine/test10/stopped-monitor-21.exp
index 39054cf..0a912fe 100644
--- a/pengine/test10/stopped-monitor-21.exp
+++ b/pengine/test10/stopped-monitor-21.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-22.exp b/pengine/test10/stopped-monitor-22.exp
index e5dc1de..5a3476e 100644
--- a/pengine/test10/stopped-monitor-22.exp
+++ b/pengine/test10/stopped-monitor-22.exp
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -53,7 +53,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-23.exp b/pengine/test10/stopped-monitor-23.exp
index eb42407..75bfca2 100644
--- a/pengine/test10/stopped-monitor-23.exp
+++ b/pengine/test10/stopped-monitor-23.exp
@@ -36,7 +36,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -44,7 +44,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-24.exp b/pengine/test10/stopped-monitor-24.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-24.exp
+++ b/pengine/test10/stopped-monitor-24.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-25.exp b/pengine/test10/stopped-monitor-25.exp
index 1cff5b2..cc62d3f 100644
--- a/pengine/test10/stopped-monitor-25.exp
+++ b/pengine/test10/stopped-monitor-25.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -27,7 +27,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-26.exp b/pengine/test10/stopped-monitor-26.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/stopped-monitor-26.exp
+++ b/pengine/test10/stopped-monitor-26.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-27.exp b/pengine/test10/stopped-monitor-27.exp
index 1cff5b2..cc62d3f 100644
--- a/pengine/test10/stopped-monitor-27.exp
+++ b/pengine/test10/stopped-monitor-27.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -27,7 +27,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/stopped-monitor-30.exp b/pengine/test10/stopped-monitor-30.exp
index 2dce65f..fb3c88f 100644
--- a/pengine/test10/stopped-monitor-30.exp
+++ b/pengine/test10/stopped-monitor-30.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -35,7 +35,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -43,7 +43,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -57,13 +57,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/stopped-monitor-31.exp b/pengine/test10/stopped-monitor-31.exp
index 394cbc7..e51c78d 100644
--- a/pengine/test10/stopped-monitor-31.exp
+++ b/pengine/test10/stopped-monitor-31.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -35,7 +35,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -43,7 +43,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -57,13 +57,13 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node3" on_node="node3" on_node_uuid="node3"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealth2.exp b/pengine/test10/systemhealth2.exp
index 68b5078..95d8847 100644
--- a/pengine/test10/systemhealth2.exp
+++ b/pengine/test10/systemhealth2.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealth3.exp b/pengine/test10/systemhealth3.exp
index 68b5078..95d8847 100644
--- a/pengine/test10/systemhealth3.exp
+++ b/pengine/test10/systemhealth3.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthm2.exp b/pengine/test10/systemhealthm2.exp
index 68b5078..95d8847 100644
--- a/pengine/test10/systemhealthm2.exp
+++ b/pengine/test10/systemhealthm2.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthm3.exp b/pengine/test10/systemhealthm3.exp
index 7246b5b..4100342 100644
--- a/pengine/test10/systemhealthm3.exp
+++ b/pengine/test10/systemhealthm3.exp
@@ -48,7 +48,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,7 +72,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthn2.exp b/pengine/test10/systemhealthn2.exp
index 68b5078..95d8847 100644
--- a/pengine/test10/systemhealthn2.exp
+++ b/pengine/test10/systemhealthn2.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthn3.exp b/pengine/test10/systemhealthn3.exp
index 68b5078..95d8847 100644
--- a/pengine/test10/systemhealthn3.exp
+++ b/pengine/test10/systemhealthn3.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealtho2.exp b/pengine/test10/systemhealtho2.exp
index 7246b5b..4100342 100644
--- a/pengine/test10/systemhealtho2.exp
+++ b/pengine/test10/systemhealtho2.exp
@@ -48,7 +48,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,7 +72,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealtho3.exp b/pengine/test10/systemhealtho3.exp
index 7246b5b..4100342 100644
--- a/pengine/test10/systemhealtho3.exp
+++ b/pengine/test10/systemhealtho3.exp
@@ -48,7 +48,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,7 +72,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthp2.exp b/pengine/test10/systemhealthp2.exp
index e3ba25d..77729c4 100644
--- a/pengine/test10/systemhealthp2.exp
+++ b/pengine/test10/systemhealthp2.exp
@@ -106,7 +106,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -130,7 +130,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/systemhealthp3.exp b/pengine/test10/systemhealthp3.exp
index 7246b5b..4100342 100644
--- a/pengine/test10/systemhealthp3.exp
+++ b/pengine/test10/systemhealthp3.exp
@@ -48,7 +48,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,7 +72,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hs21c" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/target-0.exp b/pengine/test10/target-0.exp
index 1233c09..825d9ae 100644
--- a/pengine/test10/target-0.exp
+++ b/pengine/test10/target-0.exp
@@ -136,7 +136,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,7 +157,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -178,7 +178,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -196,7 +196,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -223,16 +223,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/target-1.exp b/pengine/test10/target-1.exp
index 15d6a54..06ac73d 100644
--- a/pengine/test10/target-1.exp
+++ b/pengine/test10/target-1.exp
@@ -122,7 +122,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -140,7 +140,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -176,7 +176,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -200,16 +200,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="15" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="20" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/target-2.exp b/pengine/test10/target-2.exp
index 94e1e86..a723118 100644
--- a/pengine/test10/target-2.exp
+++ b/pengine/test10/target-2.exp
@@ -149,7 +149,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -170,7 +170,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -191,7 +191,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -209,7 +209,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -236,16 +236,16 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-c001n01" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
</trigger>
<trigger>
- <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-c001n02" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
</trigger>
<trigger>
- <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="17" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
<trigger>
- <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+ <rsc_op id="22" operation="probe_complete" operation_key="probe_complete-c001n08" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-1.exp b/pengine/test10/template-1.exp
index a65f3c5..0fef2b0 100644
--- a/pengine/test10/template-1.exp
+++ b/pengine/test10/template-1.exp
@@ -66,7 +66,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -81,7 +81,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -102,10 +102,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-2.exp b/pengine/test10/template-2.exp
index a206d20..0fd08cb 100644
--- a/pengine/test10/template-2.exp
+++ b/pengine/test10/template-2.exp
@@ -66,7 +66,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -81,7 +81,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -102,10 +102,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-3.exp b/pengine/test10/template-3.exp
index f76a695..6b65404 100644
--- a/pengine/test10/template-3.exp
+++ b/pengine/test10/template-3.exp
@@ -121,7 +121,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -136,7 +136,7 @@
</synapse>
<synapse id="11" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -157,10 +157,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-clone-group.exp b/pengine/test10/template-clone-group.exp
index 7d06925..2ec6921 100644
--- a/pengine/test10/template-clone-group.exp
+++ b/pengine/test10/template-clone-group.exp
@@ -193,7 +193,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -208,7 +208,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -229,10 +229,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-clone-primitive.exp b/pengine/test10/template-clone-primitive.exp
index b631908..151edf6 100644
--- a/pengine/test10/template-clone-primitive.exp
+++ b/pengine/test10/template-clone-primitive.exp
@@ -77,7 +77,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,7 +89,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -107,10 +107,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-coloc-1.exp b/pengine/test10/template-coloc-1.exp
index 871e4e1..96fce66 100644
--- a/pengine/test10/template-coloc-1.exp
+++ b/pengine/test10/template-coloc-1.exp
@@ -125,7 +125,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -173,10 +173,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-coloc-2.exp b/pengine/test10/template-coloc-2.exp
index 871e4e1..96fce66 100644
--- a/pengine/test10/template-coloc-2.exp
+++ b/pengine/test10/template-coloc-2.exp
@@ -125,7 +125,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -146,7 +146,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -173,10 +173,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-coloc-3.exp b/pengine/test10/template-coloc-3.exp
index 37e359b..74e9f90 100644
--- a/pengine/test10/template-coloc-3.exp
+++ b/pengine/test10/template-coloc-3.exp
@@ -187,7 +187,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -214,7 +214,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -247,10 +247,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-order-1.exp b/pengine/test10/template-order-1.exp
index 82c79fa..dc9ecd9 100644
--- a/pengine/test10/template-order-1.exp
+++ b/pengine/test10/template-order-1.exp
@@ -134,7 +134,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -155,7 +155,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -182,10 +182,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-order-2.exp b/pengine/test10/template-order-2.exp
index 261ae44..bbf7d9c 100644
--- a/pengine/test10/template-order-2.exp
+++ b/pengine/test10/template-order-2.exp
@@ -134,7 +134,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -155,7 +155,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -182,10 +182,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-order-3.exp b/pengine/test10/template-order-3.exp
index 7e2e90f..17eab13 100644
--- a/pengine/test10/template-order-3.exp
+++ b/pengine/test10/template-order-3.exp
@@ -214,7 +214,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -241,7 +241,7 @@
</synapse>
<synapse id="19" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -274,10 +274,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-rsc-sets-1.exp b/pengine/test10/template-rsc-sets-1.exp
index 0e0f6bd..5166d93 100644
--- a/pengine/test10/template-rsc-sets-1.exp
+++ b/pengine/test10/template-rsc-sets-1.exp
@@ -168,7 +168,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -192,7 +192,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -222,10 +222,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-rsc-sets-2.exp b/pengine/test10/template-rsc-sets-2.exp
index 6e08aad..43c138b 100644
--- a/pengine/test10/template-rsc-sets-2.exp
+++ b/pengine/test10/template-rsc-sets-2.exp
@@ -174,7 +174,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -198,7 +198,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -228,10 +228,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-rsc-sets-3.exp b/pengine/test10/template-rsc-sets-3.exp
index 0e0f6bd..5166d93 100644
--- a/pengine/test10/template-rsc-sets-3.exp
+++ b/pengine/test10/template-rsc-sets-3.exp
@@ -168,7 +168,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -192,7 +192,7 @@
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -222,10 +222,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-rsc-sets-4.exp b/pengine/test10/template-rsc-sets-4.exp
index f97def2..a00ac64 100644
--- a/pengine/test10/template-rsc-sets-4.exp
+++ b/pengine/test10/template-rsc-sets-4.exp
@@ -55,7 +55,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,7 +73,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -97,10 +97,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/template-ticket.exp b/pengine/test10/template-ticket.exp
index f97def2..a00ac64 100644
--- a/pengine/test10/template-ticket.exp
+++ b/pengine/test10/template-ticket.exp
@@ -55,7 +55,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,7 +73,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -97,10 +97,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-clone-1.exp b/pengine/test10/ticket-clone-1.exp
index e3a5cb8..e127ef8 100644
--- a/pengine/test10/ticket-clone-1.exp
+++ b/pengine/test10/ticket-clone-1.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-clone-10.exp b/pengine/test10/ticket-clone-10.exp
index e3a5cb8..e127ef8 100644
--- a/pengine/test10/ticket-clone-10.exp
+++ b/pengine/test10/ticket-clone-10.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-clone-11.exp b/pengine/test10/ticket-clone-11.exp
index 9fc69df..cc7e89a 100644
--- a/pengine/test10/ticket-clone-11.exp
+++ b/pengine/test10/ticket-clone-11.exp
@@ -79,7 +79,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -87,7 +87,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-12.exp b/pengine/test10/ticket-clone-12.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-clone-12.exp
+++ b/pengine/test10/ticket-clone-12.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-13.exp b/pengine/test10/ticket-clone-13.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-clone-13.exp
+++ b/pengine/test10/ticket-clone-13.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-14.exp b/pengine/test10/ticket-clone-14.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-14.exp
+++ b/pengine/test10/ticket-clone-14.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-15.exp b/pengine/test10/ticket-clone-15.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-15.exp
+++ b/pengine/test10/ticket-clone-15.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-16.exp b/pengine/test10/ticket-clone-16.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-clone-16.exp
+++ b/pengine/test10/ticket-clone-16.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-17.exp b/pengine/test10/ticket-clone-17.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-17.exp
+++ b/pengine/test10/ticket-clone-17.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-18.exp b/pengine/test10/ticket-clone-18.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-18.exp
+++ b/pengine/test10/ticket-clone-18.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-19.exp b/pengine/test10/ticket-clone-19.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-clone-19.exp
+++ b/pengine/test10/ticket-clone-19.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-2.exp b/pengine/test10/ticket-clone-2.exp
index 9fc69df..cc7e89a 100644
--- a/pengine/test10/ticket-clone-2.exp
+++ b/pengine/test10/ticket-clone-2.exp
@@ -79,7 +79,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -87,7 +87,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-20.exp b/pengine/test10/ticket-clone-20.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-20.exp
+++ b/pengine/test10/ticket-clone-20.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-22.exp b/pengine/test10/ticket-clone-22.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-clone-22.exp
+++ b/pengine/test10/ticket-clone-22.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-23.exp b/pengine/test10/ticket-clone-23.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-23.exp
+++ b/pengine/test10/ticket-clone-23.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-24.exp b/pengine/test10/ticket-clone-24.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-clone-24.exp
+++ b/pengine/test10/ticket-clone-24.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-3.exp b/pengine/test10/ticket-clone-3.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-3.exp
+++ b/pengine/test10/ticket-clone-3.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-4.exp b/pengine/test10/ticket-clone-4.exp
index e3a5cb8..e127ef8 100644
--- a/pengine/test10/ticket-clone-4.exp
+++ b/pengine/test10/ticket-clone-4.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-clone-5.exp b/pengine/test10/ticket-clone-5.exp
index 9fc69df..cc7e89a 100644
--- a/pengine/test10/ticket-clone-5.exp
+++ b/pengine/test10/ticket-clone-5.exp
@@ -79,7 +79,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -87,7 +87,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-6.exp b/pengine/test10/ticket-clone-6.exp
index f9dffd7..cd56b44 100644
--- a/pengine/test10/ticket-clone-6.exp
+++ b/pengine/test10/ticket-clone-6.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -61,7 +61,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-clone-7.exp b/pengine/test10/ticket-clone-7.exp
index e3a5cb8..e127ef8 100644
--- a/pengine/test10/ticket-clone-7.exp
+++ b/pengine/test10/ticket-clone-7.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-clone-8.exp b/pengine/test10/ticket-clone-8.exp
index 9fc69df..cc7e89a 100644
--- a/pengine/test10/ticket-clone-8.exp
+++ b/pengine/test10/ticket-clone-8.exp
@@ -79,7 +79,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -87,7 +87,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-1.exp b/pengine/test10/ticket-group-1.exp
index 328d7a7..15dd4eb 100644
--- a/pengine/test10/ticket-group-1.exp
+++ b/pengine/test10/ticket-group-1.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,10 +73,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-group-10.exp b/pengine/test10/ticket-group-10.exp
index 328d7a7..15dd4eb 100644
--- a/pengine/test10/ticket-group-10.exp
+++ b/pengine/test10/ticket-group-10.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,10 +73,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-group-11.exp b/pengine/test10/ticket-group-11.exp
index e1b6cc1..7048e97 100644
--- a/pengine/test10/ticket-group-11.exp
+++ b/pengine/test10/ticket-group-11.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-12.exp b/pengine/test10/ticket-group-12.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-group-12.exp
+++ b/pengine/test10/ticket-group-12.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-13.exp b/pengine/test10/ticket-group-13.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-group-13.exp
+++ b/pengine/test10/ticket-group-13.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-14.exp b/pengine/test10/ticket-group-14.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-14.exp
+++ b/pengine/test10/ticket-group-14.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-15.exp b/pengine/test10/ticket-group-15.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-15.exp
+++ b/pengine/test10/ticket-group-15.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-16.exp b/pengine/test10/ticket-group-16.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-group-16.exp
+++ b/pengine/test10/ticket-group-16.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-17.exp b/pengine/test10/ticket-group-17.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-17.exp
+++ b/pengine/test10/ticket-group-17.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-18.exp b/pengine/test10/ticket-group-18.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-18.exp
+++ b/pengine/test10/ticket-group-18.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-19.exp b/pengine/test10/ticket-group-19.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-group-19.exp
+++ b/pengine/test10/ticket-group-19.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-2.exp b/pengine/test10/ticket-group-2.exp
index e1b6cc1..7048e97 100644
--- a/pengine/test10/ticket-group-2.exp
+++ b/pengine/test10/ticket-group-2.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-20.exp b/pengine/test10/ticket-group-20.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-20.exp
+++ b/pengine/test10/ticket-group-20.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-21.exp b/pengine/test10/ticket-group-21.exp
index d85b683..c7b5b72 100644
--- a/pengine/test10/ticket-group-21.exp
+++ b/pengine/test10/ticket-group-21.exp
@@ -84,7 +84,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-22.exp b/pengine/test10/ticket-group-22.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-group-22.exp
+++ b/pengine/test10/ticket-group-22.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-23.exp b/pengine/test10/ticket-group-23.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-23.exp
+++ b/pengine/test10/ticket-group-23.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-24.exp b/pengine/test10/ticket-group-24.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-group-24.exp
+++ b/pengine/test10/ticket-group-24.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-3.exp b/pengine/test10/ticket-group-3.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-3.exp
+++ b/pengine/test10/ticket-group-3.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-4.exp b/pengine/test10/ticket-group-4.exp
index 328d7a7..15dd4eb 100644
--- a/pengine/test10/ticket-group-4.exp
+++ b/pengine/test10/ticket-group-4.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,10 +73,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-group-5.exp b/pengine/test10/ticket-group-5.exp
index e1b6cc1..7048e97 100644
--- a/pengine/test10/ticket-group-5.exp
+++ b/pengine/test10/ticket-group-5.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-6.exp b/pengine/test10/ticket-group-6.exp
index 250b6ee..b3b1182 100644
--- a/pengine/test10/ticket-group-6.exp
+++ b/pengine/test10/ticket-group-6.exp
@@ -56,7 +56,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-7.exp b/pengine/test10/ticket-group-7.exp
index 328d7a7..15dd4eb 100644
--- a/pengine/test10/ticket-group-7.exp
+++ b/pengine/test10/ticket-group-7.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -52,7 +52,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,10 +73,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-group-8.exp b/pengine/test10/ticket-group-8.exp
index e1b6cc1..7048e97 100644
--- a/pengine/test10/ticket-group-8.exp
+++ b/pengine/test10/ticket-group-8.exp
@@ -82,7 +82,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -90,7 +90,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-group-9.exp b/pengine/test10/ticket-group-9.exp
index d85b683..c7b5b72 100644
--- a/pengine/test10/ticket-group-9.exp
+++ b/pengine/test10/ticket-group-9.exp
@@ -84,7 +84,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-1.exp b/pengine/test10/ticket-master-1.exp
index 3a93a0e..55abf78 100644
--- a/pengine/test10/ticket-master-1.exp
+++ b/pengine/test10/ticket-master-1.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-master-10.exp b/pengine/test10/ticket-master-10.exp
index 8f76f85..44cb6a0 100644
--- a/pengine/test10/ticket-master-10.exp
+++ b/pengine/test10/ticket-master-10.exp
@@ -77,7 +77,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,7 +89,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -107,10 +107,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-master-11.exp b/pengine/test10/ticket-master-11.exp
index d160526..c0299ae 100644
--- a/pengine/test10/ticket-master-11.exp
+++ b/pengine/test10/ticket-master-11.exp
@@ -34,7 +34,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -42,7 +42,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-12.exp b/pengine/test10/ticket-master-12.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-master-12.exp
+++ b/pengine/test10/ticket-master-12.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-13.exp b/pengine/test10/ticket-master-13.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-master-13.exp
+++ b/pengine/test10/ticket-master-13.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-14.exp b/pengine/test10/ticket-master-14.exp
index 256060e..2e1faee 100644
--- a/pengine/test10/ticket-master-14.exp
+++ b/pengine/test10/ticket-master-14.exp
@@ -96,7 +96,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -104,7 +104,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-15.exp b/pengine/test10/ticket-master-15.exp
index 256060e..2e1faee 100644
--- a/pengine/test10/ticket-master-15.exp
+++ b/pengine/test10/ticket-master-15.exp
@@ -96,7 +96,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -104,7 +104,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-16.exp b/pengine/test10/ticket-master-16.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-master-16.exp
+++ b/pengine/test10/ticket-master-16.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-17.exp b/pengine/test10/ticket-master-17.exp
index b1b51b2..47b3cd7 100644
--- a/pengine/test10/ticket-master-17.exp
+++ b/pengine/test10/ticket-master-17.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-18.exp b/pengine/test10/ticket-master-18.exp
index b1b51b2..47b3cd7 100644
--- a/pengine/test10/ticket-master-18.exp
+++ b/pengine/test10/ticket-master-18.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-19.exp b/pengine/test10/ticket-master-19.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-master-19.exp
+++ b/pengine/test10/ticket-master-19.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-2.exp b/pengine/test10/ticket-master-2.exp
index 967072c..c995d00 100644
--- a/pengine/test10/ticket-master-2.exp
+++ b/pengine/test10/ticket-master-2.exp
@@ -93,7 +93,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -101,7 +101,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-20.exp b/pengine/test10/ticket-master-20.exp
index b1b51b2..47b3cd7 100644
--- a/pengine/test10/ticket-master-20.exp
+++ b/pengine/test10/ticket-master-20.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-21.exp b/pengine/test10/ticket-master-21.exp
index 1ed731c..5b21e47 100644
--- a/pengine/test10/ticket-master-21.exp
+++ b/pengine/test10/ticket-master-21.exp
@@ -135,7 +135,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-22.exp b/pengine/test10/ticket-master-22.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-master-22.exp
+++ b/pengine/test10/ticket-master-22.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-23.exp b/pengine/test10/ticket-master-23.exp
index b1b51b2..47b3cd7 100644
--- a/pengine/test10/ticket-master-23.exp
+++ b/pengine/test10/ticket-master-23.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-24.exp b/pengine/test10/ticket-master-24.exp
index 6d57001..641b47d 100644
--- a/pengine/test10/ticket-master-24.exp
+++ b/pengine/test10/ticket-master-24.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-3.exp b/pengine/test10/ticket-master-3.exp
index 256060e..2e1faee 100644
--- a/pengine/test10/ticket-master-3.exp
+++ b/pengine/test10/ticket-master-3.exp
@@ -96,7 +96,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -104,7 +104,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-4.exp b/pengine/test10/ticket-master-4.exp
index 8f76f85..44cb6a0 100644
--- a/pengine/test10/ticket-master-4.exp
+++ b/pengine/test10/ticket-master-4.exp
@@ -77,7 +77,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,7 +89,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -107,10 +107,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-master-5.exp b/pengine/test10/ticket-master-5.exp
index d160526..c0299ae 100644
--- a/pengine/test10/ticket-master-5.exp
+++ b/pengine/test10/ticket-master-5.exp
@@ -34,7 +34,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -42,7 +42,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-6.exp b/pengine/test10/ticket-master-6.exp
index b1b51b2..47b3cd7 100644
--- a/pengine/test10/ticket-master-6.exp
+++ b/pengine/test10/ticket-master-6.exp
@@ -37,7 +37,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -45,7 +45,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-7.exp b/pengine/test10/ticket-master-7.exp
index 8f76f85..44cb6a0 100644
--- a/pengine/test10/ticket-master-7.exp
+++ b/pengine/test10/ticket-master-7.exp
@@ -77,7 +77,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,7 +89,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -107,10 +107,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-master-8.exp b/pengine/test10/ticket-master-8.exp
index d160526..c0299ae 100644
--- a/pengine/test10/ticket-master-8.exp
+++ b/pengine/test10/ticket-master-8.exp
@@ -34,7 +34,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -42,7 +42,7 @@
</synapse>
<synapse id="4" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-master-9.exp b/pengine/test10/ticket-master-9.exp
index 1ed731c..5b21e47 100644
--- a/pengine/test10/ticket-master-9.exp
+++ b/pengine/test10/ticket-master-9.exp
@@ -135,7 +135,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-1.exp b/pengine/test10/ticket-primitive-1.exp
index b532698..88a1075 100644
--- a/pengine/test10/ticket-primitive-1.exp
+++ b/pengine/test10/ticket-primitive-1.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-primitive-10.exp b/pengine/test10/ticket-primitive-10.exp
index b532698..88a1075 100644
--- a/pengine/test10/ticket-primitive-10.exp
+++ b/pengine/test10/ticket-primitive-10.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-primitive-11.exp b/pengine/test10/ticket-primitive-11.exp
index 2d13079..ed47627 100644
--- a/pengine/test10/ticket-primitive-11.exp
+++ b/pengine/test10/ticket-primitive-11.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-12.exp b/pengine/test10/ticket-primitive-12.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/ticket-primitive-12.exp
+++ b/pengine/test10/ticket-primitive-12.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-13.exp b/pengine/test10/ticket-primitive-13.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-primitive-13.exp
+++ b/pengine/test10/ticket-primitive-13.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-14.exp b/pengine/test10/ticket-primitive-14.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-14.exp
+++ b/pengine/test10/ticket-primitive-14.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-15.exp b/pengine/test10/ticket-primitive-15.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-15.exp
+++ b/pengine/test10/ticket-primitive-15.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-16.exp b/pengine/test10/ticket-primitive-16.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-primitive-16.exp
+++ b/pengine/test10/ticket-primitive-16.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-17.exp b/pengine/test10/ticket-primitive-17.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-17.exp
+++ b/pengine/test10/ticket-primitive-17.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-18.exp b/pengine/test10/ticket-primitive-18.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-18.exp
+++ b/pengine/test10/ticket-primitive-18.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-19.exp b/pengine/test10/ticket-primitive-19.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-primitive-19.exp
+++ b/pengine/test10/ticket-primitive-19.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-2.exp b/pengine/test10/ticket-primitive-2.exp
index 2d13079..ed47627 100644
--- a/pengine/test10/ticket-primitive-2.exp
+++ b/pengine/test10/ticket-primitive-2.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-20.exp b/pengine/test10/ticket-primitive-20.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-20.exp
+++ b/pengine/test10/ticket-primitive-20.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-21.exp b/pengine/test10/ticket-primitive-21.exp
index c88cf38..72fcacd 100644
--- a/pengine/test10/ticket-primitive-21.exp
+++ b/pengine/test10/ticket-primitive-21.exp
@@ -33,7 +33,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-22.exp b/pengine/test10/ticket-primitive-22.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-primitive-22.exp
+++ b/pengine/test10/ticket-primitive-22.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-23.exp b/pengine/test10/ticket-primitive-23.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-23.exp
+++ b/pengine/test10/ticket-primitive-23.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-24.exp b/pengine/test10/ticket-primitive-24.exp
index ba6632b..0f663b1 100644
--- a/pengine/test10/ticket-primitive-24.exp
+++ b/pengine/test10/ticket-primitive-24.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-3.exp b/pengine/test10/ticket-primitive-3.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-3.exp
+++ b/pengine/test10/ticket-primitive-3.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-4.exp b/pengine/test10/ticket-primitive-4.exp
index b532698..88a1075 100644
--- a/pengine/test10/ticket-primitive-4.exp
+++ b/pengine/test10/ticket-primitive-4.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-primitive-5.exp b/pengine/test10/ticket-primitive-5.exp
index 2d13079..ed47627 100644
--- a/pengine/test10/ticket-primitive-5.exp
+++ b/pengine/test10/ticket-primitive-5.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-6.exp b/pengine/test10/ticket-primitive-6.exp
index 3cb5f90..12753e9 100644
--- a/pengine/test10/ticket-primitive-6.exp
+++ b/pengine/test10/ticket-primitive-6.exp
@@ -10,7 +10,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -18,7 +18,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-7.exp b/pengine/test10/ticket-primitive-7.exp
index b532698..88a1075 100644
--- a/pengine/test10/ticket-primitive-7.exp
+++ b/pengine/test10/ticket-primitive-7.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -49,10 +49,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-primitive-8.exp b/pengine/test10/ticket-primitive-8.exp
index 2d13079..ed47627 100644
--- a/pengine/test10/ticket-primitive-8.exp
+++ b/pengine/test10/ticket-primitive-8.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-primitive-9.exp b/pengine/test10/ticket-primitive-9.exp
index c88cf38..72fcacd 100644
--- a/pengine/test10/ticket-primitive-9.exp
+++ b/pengine/test10/ticket-primitive-9.exp
@@ -33,7 +33,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-1.exp b/pengine/test10/ticket-rsc-sets-1.exp
index 20800e2..869b1e3 100644
--- a/pengine/test10/ticket-rsc-sets-1.exp
+++ b/pengine/test10/ticket-rsc-sets-1.exp
@@ -149,7 +149,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -173,7 +173,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -203,10 +203,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-rsc-sets-10.exp b/pengine/test10/ticket-rsc-sets-10.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-10.exp
+++ b/pengine/test10/ticket-rsc-sets-10.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-11.exp b/pengine/test10/ticket-rsc-sets-11.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-rsc-sets-11.exp
+++ b/pengine/test10/ticket-rsc-sets-11.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-12.exp b/pengine/test10/ticket-rsc-sets-12.exp
index 2712003..bc5c4d4 100644
--- a/pengine/test10/ticket-rsc-sets-12.exp
+++ b/pengine/test10/ticket-rsc-sets-12.exp
@@ -65,7 +65,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -73,7 +73,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-13.exp b/pengine/test10/ticket-rsc-sets-13.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-13.exp
+++ b/pengine/test10/ticket-rsc-sets-13.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-14.exp b/pengine/test10/ticket-rsc-sets-14.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-14.exp
+++ b/pengine/test10/ticket-rsc-sets-14.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-2.exp b/pengine/test10/ticket-rsc-sets-2.exp
index 5618565..0594676 100644
--- a/pengine/test10/ticket-rsc-sets-2.exp
+++ b/pengine/test10/ticket-rsc-sets-2.exp
@@ -215,7 +215,7 @@
</synapse>
<synapse id="17" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -223,7 +223,7 @@
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-3.exp b/pengine/test10/ticket-rsc-sets-3.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-3.exp
+++ b/pengine/test10/ticket-rsc-sets-3.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-4.exp b/pengine/test10/ticket-rsc-sets-4.exp
index 20800e2..869b1e3 100644
--- a/pengine/test10/ticket-rsc-sets-4.exp
+++ b/pengine/test10/ticket-rsc-sets-4.exp
@@ -149,7 +149,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -173,7 +173,7 @@
</synapse>
<synapse id="15" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -203,10 +203,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
</trigger>
<trigger>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/ticket-rsc-sets-5.exp b/pengine/test10/ticket-rsc-sets-5.exp
index 9e20a6b..206959f 100644
--- a/pengine/test10/ticket-rsc-sets-5.exp
+++ b/pengine/test10/ticket-rsc-sets-5.exp
@@ -104,7 +104,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -112,7 +112,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-6.exp b/pengine/test10/ticket-rsc-sets-6.exp
index 9bd2d3a..91ce17e 100644
--- a/pengine/test10/ticket-rsc-sets-6.exp
+++ b/pengine/test10/ticket-rsc-sets-6.exp
@@ -112,7 +112,7 @@
</synapse>
<synapse id="9" priority="1000000">
<action_set>
- <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -120,7 +120,7 @@
</synapse>
<synapse id="10" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-7.exp b/pengine/test10/ticket-rsc-sets-7.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-7.exp
+++ b/pengine/test10/ticket-rsc-sets-7.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-8.exp b/pengine/test10/ticket-rsc-sets-8.exp
index ccd7539..cf75a01 100644
--- a/pengine/test10/ticket-rsc-sets-8.exp
+++ b/pengine/test10/ticket-rsc-sets-8.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/ticket-rsc-sets-9.exp b/pengine/test10/ticket-rsc-sets-9.exp
index 35e5a99..36b6cc9 100644
--- a/pengine/test10/ticket-rsc-sets-9.exp
+++ b/pengine/test10/ticket-rsc-sets-9.exp
@@ -153,7 +153,7 @@
</synapse>
<synapse id="12" priority="1000000">
<action_set>
- <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -161,7 +161,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/unmanaged-master.exp b/pengine/test10/unmanaged-master.exp
index 9e0f188..58311fd 100644
--- a/pengine/test10/unmanaged-master.exp
+++ b/pengine/test10/unmanaged-master.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1" batch-limit="10" transition_id="0">
<synapse id="0">
<action_set>
- <crm_event id="92" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-2" on_node_uuid="pcmk-2">
+ <crm_event id="92" operation="do_shutdown" operation_key="do_shutdown-pcmk-2" on_node="pcmk-2" on_node_uuid="pcmk-2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
@@ -9,13 +9,13 @@
</synapse>
<synapse id="1">
<action_set>
- <crm_event id="91" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-1" on_node_uuid="pcmk-1">
+ <crm_event id="91" operation="do_shutdown" operation_key="do_shutdown-pcmk-1" on_node="pcmk-1" on_node_uuid="pcmk-1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</crm_event>
</action_set>
<inputs>
<trigger>
- <crm_event id="92" operation="do_shutdown" operation_key="do_shutdown" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
+ <crm_event id="92" operation="do_shutdown" operation_key="do_shutdown-pcmk-2" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/unmanaged-stop-1.exp b/pengine/test10/unmanaged-stop-1.exp
index 7845919..ed7dcfb 100644
--- a/pengine/test10/unmanaged-stop-1.exp
+++ b/pengine/test10/unmanaged-stop-1.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/unmanaged-stop-2.exp b/pengine/test10/unmanaged-stop-2.exp
index 7845919..ed7dcfb 100644
--- a/pengine/test10/unmanaged-stop-2.exp
+++ b/pengine/test10/unmanaged-stop-2.exp
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
<synapse id="0" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/unmanaged-stop-3.exp b/pengine/test10/unmanaged-stop-3.exp
index 2cb2435..a1db8b0 100644
--- a/pengine/test10/unmanaged-stop-3.exp
+++ b/pengine/test10/unmanaged-stop-3.exp
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/unmanaged-stop-4.exp b/pengine/test10/unmanaged-stop-4.exp
index 2cb2435..a1db8b0 100644
--- a/pengine/test10/unmanaged-stop-4.exp
+++ b/pengine/test10/unmanaged-stop-4.exp
@@ -9,7 +9,7 @@
</synapse>
<synapse id="1" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="yingying.site" on_node_uuid="yingying.site">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-yingying.site" on_node="yingying.site" on_node_uuid="yingying.site">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/unrunnable-1.exp b/pengine/test10/unrunnable-1.exp
index 62a6e29..35b17ee 100644
--- a/pengine/test10/unrunnable-1.exp
+++ b/pengine/test10/unrunnable-1.exp
@@ -120,7 +120,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -168,7 +168,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+ <rsc_op id="4" operation="probe_complete" operation_key="probe_complete-c001n03" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/use-after-free-merge.exp b/pengine/test10/use-after-free-merge.exp
index e7052b1..178b84e 100644
--- a/pengine/test10/use-after-free-merge.exp
+++ b/pengine/test10/use-after-free-merge.exp
@@ -144,7 +144,7 @@
</synapse>
<synapse id="13" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="hex-14" on_node_uuid="hex-14">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-hex-14" on_node="hex-14" on_node_uuid="hex-14">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -165,7 +165,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hex-13" on_node_uuid="hex-13">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hex-13" on_node="hex-13" on_node_uuid="hex-13">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -192,10 +192,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="hex-13" on_node_uuid="hex-13"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-hex-13" on_node="hex-13" on_node_uuid="hex-13"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="hex-14" on_node_uuid="hex-14"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-hex-14" on_node="hex-14" on_node_uuid="hex-14"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/utilization-order1.exp b/pengine/test10/utilization-order1.exp
index c5e551d..40ba326 100644
--- a/pengine/test10/utilization-order1.exp
+++ b/pengine/test10/utilization-order1.exp
@@ -23,7 +23,7 @@
</synapse>
<synapse id="2" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -31,7 +31,7 @@
</synapse>
<synapse id="3" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/utilization-order2.exp b/pengine/test10/utilization-order2.exp
index f62a8ef..dfa3f60 100644
--- a/pengine/test10/utilization-order2.exp
+++ b/pengine/test10/utilization-order2.exp
@@ -84,7 +84,7 @@
</synapse>
<synapse id="7" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -92,7 +92,7 @@
</synapse>
<synapse id="8" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/utilization-order3.exp b/pengine/test10/utilization-order3.exp
index 570a39e..9075052 100644
--- a/pengine/test10/utilization-order3.exp
+++ b/pengine/test10/utilization-order3.exp
@@ -64,7 +64,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -72,7 +72,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
diff --git a/pengine/test10/utilization.exp b/pengine/test10/utilization.exp
index ed08a2b..f6c1b69 100644
--- a/pengine/test10/utilization.exp
+++ b/pengine/test10/utilization.exp
@@ -53,7 +53,7 @@
</synapse>
<synapse id="5" priority="1000000">
<action_set>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2">
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -68,7 +68,7 @@
</synapse>
<synapse id="6" priority="1000000">
<action_set>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1">
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -89,10 +89,10 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="host1" on_node_uuid="host1"/>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-host1" on_node="host1" on_node_uuid="host1"/>
</trigger>
<trigger>
- <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="host2" on_node_uuid="host2"/>
+ <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-host2" on_node="host2" on_node_uuid="host2"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/whitebox-fail3.exp b/pengine/test10/whitebox-fail3.exp
index c5a6474..739d71b 100644
--- a/pengine/test10/whitebox-fail3.exp
+++ b/pengine/test10/whitebox-fail3.exp
@@ -187,7 +187,7 @@
</synapse>
<synapse id="14" priority="1000000">
<action_set>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="dvossel-laptop2" on_node_uuid="24815808">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-dvossel-laptop2" on_node="dvossel-laptop2" on_node_uuid="24815808">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
</rsc_op>
</action_set>
@@ -205,7 +205,7 @@
</action_set>
<inputs>
<trigger>
- <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-dvossel-laptop2" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
</trigger>
</inputs>
</synapse>
diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
new file mode 100644
index 0000000..1ff4595
--- /dev/null
+++ b/pengine/test10/whitebox-ms-ordering.exp
@@ -0,0 +1,503 @@
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
+ <synapse id="0">
+ <action_set>
+ <rsc_op id="19" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="1">
+ <action_set>
+ <rsc_op id="14" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3">
+ <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="2">
+ <action_set>
+ <rsc_op id="10" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="3">
+ <action_set>
+ <rsc_op id="6" operation="monitor" operation_key="container1_monitor_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="4">
+ <action_set>
+ <rsc_op id="20" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="5">
+ <action_set>
+ <rsc_op id="15" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3">
+ <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="6">
+ <action_set>
+ <rsc_op id="11" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="7">
+ <action_set>
+ <rsc_op id="7" operation="monitor" operation_key="container2_monitor_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
+ <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="8">
+ <action_set>
+ <rsc_op id="24" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="21" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="32" operation="promote" operation_key="lxc-ms-master_promote_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="36" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="9">
+ <action_set>
+ <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="28" operation="start" operation_key="lxc-ms-master_start_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="36" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="10">
+ <action_set>
+ <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0">
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="21" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="30" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="11">
+ <action_set>
+ <rsc_op id="21" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="34" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="36" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="12">
+ <action_set>
+ <rsc_op id="16" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="13">
+ <action_set>
+ <rsc_op id="12" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="14">
+ <action_set>
+ <rsc_op id="8" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="15">
+ <action_set>
+ <rsc_op id="27" operation="monitor" operation_key="lxc-ms_monitor_10000" internal_operation_key="lxc-ms:1_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
+ <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="26" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="16">
+ <action_set>
+ <rsc_op id="26" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
+ <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="25" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="28" operation="start" operation_key="lxc-ms-master_start_0"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="17">
+ <action_set>
+ <pseudo_event id="25" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0">
+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="30" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="18" priority="1000000">
+ <action_set>
+ <pseudo_event id="35" operation="demoted" operation_key="lxc-ms-master_demoted_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="21" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="34" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="19">
+ <action_set>
+ <pseudo_event id="34" operation="demote" operation_key="lxc-ms-master_demote_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="20" priority="1000000">
+ <action_set>
+ <pseudo_event id="33" operation="promoted" operation_key="lxc-ms-master_promoted_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="24" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="21">
+ <action_set>
+ <pseudo_event id="32" operation="promote" operation_key="lxc-ms-master_promote_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="29" operation="running" operation_key="lxc-ms-master_running_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="31" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="35" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="22" priority="1000000">
+ <action_set>
+ <pseudo_event id="31" operation="stopped" operation_key="lxc-ms-master_stopped_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="25" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="30" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="23">
+ <action_set>
+ <pseudo_event id="30" operation="stop" operation_key="lxc-ms-master_stop_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="35" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="24" priority="1000000">
+ <action_set>
+ <pseudo_event id="29" operation="running" operation_key="lxc-ms-master_running_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="23" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="26" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="28" operation="start" operation_key="lxc-ms-master_start_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="25">
+ <action_set>
+ <pseudo_event id="28" operation="start" operation_key="lxc-ms-master_start_0">
+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="31" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="35" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="26">
+ <action_set>
+ <rsc_op id="37" operation="monitor" operation_key="lxc1_monitor_30000" on_node="18node1" on_node_uuid="1">
+ <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_container="container1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="36" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="27">
+ <action_set>
+ <rsc_op id="36" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_container="container1" CRM_meta_name="start" CRM_meta_timeout="60000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="19" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="28">
+ <action_set>
+ <rsc_op id="39" operation="monitor" operation_key="lxc2_monitor_30000" on_node="18node1" on_node_uuid="1">
+ <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_container="container2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="29">
+ <action_set>
+ <rsc_op id="38" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1">
+ <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
+ <attributes CRM_meta_container="container2" CRM_meta_name="start" CRM_meta_timeout="60000" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="20" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="30" priority="1000000">
+ <action_set>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-18node3" on_node="18node3" on_node_uuid="3">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="14" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="15" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="16" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="31" priority="1000000">
+ <action_set>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-18node2" on_node="18node2" on_node_uuid="2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="10" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="11" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="12" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="32" priority="1000000">
+ <action_set>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-18node1" on_node="18node1" on_node_uuid="1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="6" operation="monitor" operation_key="container1_monitor_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="7" operation="monitor" operation_key="container2_monitor_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="8" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="33">
+ <action_set>
+ <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete-18node1" on_node="18node1" on_node_uuid="1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-18node2" on_node="18node2" on_node_uuid="2"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="13" operation="probe_complete" operation_key="probe_complete-18node3" on_node="18node3" on_node_uuid="3"/>
+ </trigger>
+ </inputs>
+ </synapse>
+ <synapse id="34">
+ <action_set>
+ <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs/>
+ </synapse>
+ <synapse id="35">
+ <action_set>
+ <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
+ <attributes />
+ </pseudo_event>
+ </action_set>
+ <inputs>
+ <trigger>
+ <pseudo_event id="22" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+ </trigger>
+ <trigger>
+ <pseudo_event id="25" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+ </trigger>
+ </inputs>
+ </synapse>
+</transition_graph>
diff --git a/tools/crm_simulate.c b/tools/crm_simulate.c
index 78cab50..2eb68f1 100644
--- a/tools/crm_simulate.c
+++ b/tools/crm_simulate.c
@@ -760,9 +760,12 @@ create_action_name(action_t * action)
} else if (safe_str_eq(action->task, CRM_OP_FENCE)) {
action_name = g_strdup_printf("%s%s %s", prefix ? prefix : "", action->task, action_host);
- } else if (action_host) {
+ } else if (action->rsc && action_host) {
action_name = g_strdup_printf("%s%s %s", prefix ? prefix : "", action->uuid, action_host);
+ } else if (action_host) {
+ action_name = g_strdup_printf("%s%s %s", prefix ? prefix : "", action->task, action_host);
+
} else {
action_name = g_strdup_printf("%s", action->uuid);
}
@@ -789,7 +792,7 @@ create_dotfile(pe_working_set_t * data_set, const char *dot_file, gboolean all_a
const char *color = "black";
char *action_name = create_action_name(action);
- crm_trace("Action %d: %p", action->id, action);
+ crm_trace("Action %d: %s %s %p", action->id, action_name, action->uuid, action);
if (is_set(action->flags, pe_action_pseudo)) {
font = "orange";
@@ -819,6 +822,8 @@ create_dotfile(pe_working_set_t * data_set, const char *dot_file, gboolean all_a
}
set_bit(action->flags, pe_action_dumped);
+ crm_trace("\"%s\" [ style=%s color=\"%s\" fontcolor=\"%s\"]",
+ action_name, style, color, font);
fprintf(dot_strm, "\"%s\" [ style=%s color=\"%s\" fontcolor=\"%s\"]\n",
action_name, style, color, font);
dont_write:
@@ -857,6 +862,8 @@ create_dotfile(pe_working_set_t * data_set, const char *dot_file, gboolean all_a
if (all_actions || optional == FALSE) {
before_name = create_action_name(before->action);
after_name = create_action_name(action);
+ crm_trace("\"%s\" -> \"%s\" [ style = %s]",
+ before_name, after_name, style);
fprintf(dot_strm, "\"%s\" -> \"%s\" [ style = %s]\n",
before_name, after_name, style);
free(before_name);