Blob Blame History Raw
From 76dfa6454899055a5abb38ef74d1474308230d7d Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Wed, 8 Feb 2017 13:46:49 -0600
Subject: [PATCH] Test: pengine: update regression tests for new
 meta-attributes

---
 pengine/test10/1-a-then-bm-move-b.exp              |   8 +-
 pengine/test10/10-a-then-bm-b-move-a-clone.exp     |   8 +-
 .../11-a-then-bm-b-move-a-clone-starting.exp       |  10 +-
 pengine/test10/1360.exp                            |   4 +-
 pengine/test10/1484.exp                            |   2 +-
 pengine/test10/1494.exp                            |   2 +-
 pengine/test10/2-am-then-b-move-a.exp              |   8 +-
 pengine/test10/3-am-then-bm-both-migrate.exp       |  16 +-
 pengine/test10/4-am-then-bm-b-not-migratable.exp   |  14 +-
 pengine/test10/5-am-then-bm-a-not-migratable.exp   |  12 +-
 pengine/test10/594.exp                             |  28 +-
 pengine/test10/6-migrate-group.exp                 |  24 +-
 pengine/test10/662.exp                             |  56 +--
 pengine/test10/696.exp                             |  54 +--
 .../test10/7-migrate-group-one-unmigratable.exp    |  20 +-
 pengine/test10/726.exp                             |  94 ++---
 pengine/test10/735.exp                             |  26 +-
 pengine/test10/764.exp                             |  30 +-
 pengine/test10/797.exp                             |  50 +--
 .../test10/8-am-then-bm-a-migrating-b-stopping.exp |  10 +-
 pengine/test10/829.exp                             |  38 +-
 .../test10/9-am-then-bm-b-migrating-a-stopping.exp |   4 +-
 pengine/test10/994-2.exp                           |  10 +-
 pengine/test10/994.exp                             |   6 +-
 pengine/test10/a-demote-then-b-migrate.exp         |  36 +-
 pengine/test10/a-promote-then-b-migrate.exp        |  22 +-
 pengine/test10/anti-colocation-master.exp          |   8 +-
 pengine/test10/anti-colocation-order.exp           |  12 +-
 pengine/test10/anti-colocation-slave.exp           |   8 +-
 pengine/test10/asymmetric.exp                      |   8 +-
 pengine/test10/asymmetrical-order-move.exp         |   2 +-
 pengine/test10/attrs1.exp                          |   6 +-
 pengine/test10/attrs2.exp                          |   6 +-
 pengine/test10/attrs3.exp                          |   6 +-
 pengine/test10/attrs4.exp                          |   6 +-
 pengine/test10/attrs5.exp                          |   4 +-
 pengine/test10/attrs6.exp                          |   6 +-
 pengine/test10/attrs7.exp                          |   6 +-
 pengine/test10/attrs8.exp                          |   6 +-
 pengine/test10/balanced.exp                        |  12 +-
 pengine/test10/base-score.exp                      |  10 +-
 pengine/test10/bnc-515172.exp                      |   4 +-
 pengine/test10/bug-1572-1.exp                      |  46 +-
 pengine/test10/bug-1572-2.exp                      |  26 +-
 pengine/test10/bug-1573.exp                        |   4 +-
 pengine/test10/bug-1685.exp                        |  16 +-
 pengine/test10/bug-1718.exp                        |  14 +-
 pengine/test10/bug-1765.exp                        |   8 +-
 pengine/test10/bug-1820-1.exp                      |  24 +-
 pengine/test10/bug-1820.exp                        |  18 +-
 pengine/test10/bug-1822.exp                        |  10 +-
 pengine/test10/bug-5007-masterslave_colocation.exp |   8 +-
 pengine/test10/bug-5014-A-start-B-start.exp        |  12 +-
 pengine/test10/bug-5014-A-stop-B-started.exp       |   2 +-
 pengine/test10/bug-5014-A-stopped-B-stopped.exp    |   4 +-
 pengine/test10/bug-5014-CLONE-A-start-B-start.exp  |  12 +-
 pengine/test10/bug-5014-CLONE-A-stop-B-started.exp |   2 +-
 pengine/test10/bug-5014-CthenAthenB-C-stopped.exp  |   6 +-
 pengine/test10/bug-5014-GROUP-A-start-B-start.exp  |   8 +-
 .../test10/bug-5014-GROUP-A-stopped-B-started.exp  |   2 +-
 .../bug-5014-ordered-set-symmetrical-false.exp     |   2 +-
 .../bug-5014-ordered-set-symmetrical-true.exp      |   4 +-
 pengine/test10/bug-5025-1.exp                      |   6 +-
 pengine/test10/bug-5025-3.exp                      |   8 +-
 pengine/test10/bug-5025-4.exp                      |   8 +-
 pengine/test10/bug-5028-bottom.exp                 |   2 +-
 pengine/test10/bug-5028-detach.exp                 |   2 +-
 pengine/test10/bug-5059.exp                        |  44 +-
 pengine/test10/bug-5069-op-disabled.exp            |   4 +-
 pengine/test10/bug-5140-require-all-false.exp      |   6 +-
 pengine/test10/bug-5143-ms-shuffle.exp             |  14 +-
 pengine/test10/bug-5186-partial-migrate.exp        |  16 +-
 pengine/test10/bug-cl-5168.exp                     |  14 +-
 pengine/test10/bug-cl-5170.exp                     |   4 +-
 pengine/test10/bug-cl-5212.exp                     |   4 +-
 pengine/test10/bug-cl-5213.exp                     |   2 +-
 pengine/test10/bug-cl-5219.exp                     |   2 +-
 pengine/test10/bug-cl-5247.exp                     |  34 +-
 pengine/test10/bug-lf-1852.exp                     |   8 +-
 pengine/test10/bug-lf-1920.exp                     |   2 +-
 pengine/test10/bug-lf-2106.exp                     |  16 +-
 pengine/test10/bug-lf-2153.exp                     |  10 +-
 pengine/test10/bug-lf-2160.exp                     |   4 +-
 pengine/test10/bug-lf-2171.exp                     |   8 +-
 pengine/test10/bug-lf-2213.exp                     |   4 +-
 pengine/test10/bug-lf-2317.exp                     |  14 +-
 pengine/test10/bug-lf-2358.exp                     |   8 +-
 pengine/test10/bug-lf-2361.exp                     |  18 +-
 pengine/test10/bug-lf-2422.exp                     |  26 +-
 pengine/test10/bug-lf-2435.exp                     |  12 +-
 pengine/test10/bug-lf-2445.exp                     |   4 +-
 pengine/test10/bug-lf-2453.exp                     |  10 +-
 pengine/test10/bug-lf-2474.exp                     |   4 +-
 pengine/test10/bug-lf-2493.exp                     |  68 +--
 pengine/test10/bug-lf-2508.exp                     |  14 +-
 pengine/test10/bug-lf-2544.exp                     |   2 +-
 pengine/test10/bug-lf-2551.exp                     |  10 +-
 pengine/test10/bug-lf-2574.exp                     |   8 +-
 pengine/test10/bug-lf-2581.exp                     |  26 +-
 pengine/test10/bug-lf-2606.exp                     |   4 +-
 pengine/test10/bug-lf-2613.exp                     |  36 +-
 pengine/test10/bug-lf-2619.exp                     |  38 +-
 pengine/test10/bug-n-385265-2.exp                  |  12 +-
 pengine/test10/bug-n-385265.exp                    |   2 +-
 pengine/test10/bug-n-387749.exp                    |  30 +-
 pengine/test10/bug-pm-11.exp                       |  14 +-
 pengine/test10/bug-pm-12.exp                       |  12 +-
 pengine/test10/bug-rh-1097457.exp                  |  30 +-
 pengine/test10/bug-rh-880249.exp                   |  14 +-
 pengine/test10/bug-suse-707150.exp                 |  16 +-
 pengine/test10/clone-anon-dup.exp                  |  10 +-
 pengine/test10/clone-anon-failcount.exp            |  38 +-
 pengine/test10/clone-anon-probe-1.exp              |   8 +-
 pengine/test10/clone-anon-probe-2.exp              |   2 +-
 pengine/test10/clone-colocate-instance-1.exp       |  20 +-
 pengine/test10/clone-colocate-instance-2.exp       |  20 +-
 pengine/test10/clone-fail-block-colocation.exp     |  24 +-
 pengine/test10/clone-interleave-1.exp              |  16 +-
 pengine/test10/clone-interleave-2.exp              |   8 +-
 pengine/test10/clone-interleave-3.exp              |  12 +-
 pengine/test10/clone-max-zero.exp                  |  12 +-
 pengine/test10/clone-no-shuffle.exp                |  28 +-
 pengine/test10/clone-order-16instances.exp         |  56 +--
 pengine/test10/clone-order-instance.exp            |  14 +-
 pengine/test10/clone-order-primitive.exp           |   6 +-
 pengine/test10/clone-require-all-1.exp             |   8 +-
 pengine/test10/clone-require-all-2.exp             |  10 +-
 pengine/test10/clone-require-all-3.exp             |  14 +-
 pengine/test10/clone-require-all-4.exp             |   8 +-
 pengine/test10/clone-require-all-5.exp             |  16 +-
 pengine/test10/clone-require-all-6.exp             |   4 +-
 pengine/test10/clone-require-all-7.exp             |  24 +-
 .../test10/clone-require-all-no-interleave-1.exp   |  20 +-
 .../test10/clone-require-all-no-interleave-2.exp   |  20 +-
 .../test10/clone-require-all-no-interleave-3.exp   |  18 +-
 pengine/test10/clone_min_interleave_start_one.exp  |   4 +-
 pengine/test10/clone_min_interleave_start_two.exp  |  32 +-
 pengine/test10/clone_min_interleave_stop_one.exp   |   2 +-
 pengine/test10/clone_min_interleave_stop_two.exp   |  16 +-
 pengine/test10/clone_min_start_one.exp             |  10 +-
 pengine/test10/clone_min_start_two.exp             |  12 +-
 pengine/test10/clone_min_stop_all.exp              |  14 +-
 pengine/test10/clone_min_stop_one.exp              |   2 +-
 pengine/test10/clone_min_stop_two.exp              |  12 +-
 pengine/test10/cloned-group-stop.exp               |  32 +-
 pengine/test10/cloned-group.exp                    |  16 +-
 pengine/test10/cloned_start_one.exp                |   8 +-
 pengine/test10/cloned_start_two.exp                |  10 +-
 pengine/test10/cloned_stop_one.exp                 |   4 +-
 pengine/test10/cloned_stop_two.exp                 |   8 +-
 pengine/test10/cluster-specific-params.exp         |   8 +-
 pengine/test10/colo_master_w_native.exp            |  24 +-
 pengine/test10/colo_slave_w_native.exp             |  30 +-
 pengine/test10/coloc-attr.exp                      |   4 +-
 pengine/test10/coloc-clone-stays-active.exp        |   8 +-
 pengine/test10/coloc-group.exp                     |  22 +-
 pengine/test10/coloc-intra-set.exp                 |  22 +-
 pengine/test10/coloc-list.exp                      |  28 +-
 pengine/test10/coloc-loop.exp                      |  24 +-
 pengine/test10/coloc-many-one.exp                  |  24 +-
 pengine/test10/coloc-negative-group.exp            |   4 +-
 pengine/test10/coloc-slave-anti.exp                |  12 +-
 pengine/test10/coloc_fp_logic.exp                  |   6 +-
 pengine/test10/colocate-primitive-with-clone.exp   |  16 +-
 pengine/test10/colocated-utilization-clone.exp     |  46 +-
 pengine/test10/colocated-utilization-group.exp     |  30 +-
 .../test10/colocated-utilization-primitive-1.exp   |  18 +-
 .../test10/colocated-utilization-primitive-2.exp   |  16 +-
 .../test10/colocation_constraint_stops_master.exp  |  12 +-
 .../test10/colocation_constraint_stops_slave.exp   |   6 +-
 pengine/test10/comments.exp                        |  12 +-
 pengine/test10/complex_enforce_colo.exp            | 186 ++++-----
 pengine/test10/container-1.exp                     |  16 +-
 pengine/test10/container-2.exp                     |  18 +-
 pengine/test10/container-3.exp                     |  16 +-
 pengine/test10/container-4.exp                     |  18 +-
 pengine/test10/container-group-1.exp               |  16 +-
 pengine/test10/container-group-2.exp               |  18 +-
 pengine/test10/container-group-3.exp               |  14 +-
 pengine/test10/container-group-4.exp               |  18 +-
 pengine/test10/date-1.exp                          |   6 +-
 pengine/test10/enforce-colo1.exp                   |  10 +-
 pengine/test10/expire-non-blocked-failure.exp      |   2 +-
 pengine/test10/failcount-block.exp                 |  16 +-
 pengine/test10/failcount.exp                       |   8 +-
 pengine/test10/group-dependents.exp                | 146 +++----
 pengine/test10/group-fail.exp                      |  12 +-
 pengine/test10/group-unmanaged-stopped.exp         |   2 +-
 pengine/test10/group1.exp                          |  18 +-
 pengine/test10/group10.exp                         |  36 +-
 pengine/test10/group11.exp                         |   4 +-
 pengine/test10/group13.exp                         |   2 +-
 pengine/test10/group14.exp                         |  10 +-
 pengine/test10/group15.exp                         |  30 +-
 pengine/test10/group2.exp                          |  30 +-
 pengine/test10/group3.exp                          |  36 +-
 pengine/test10/group4.exp                          |  10 +-
 pengine/test10/group5.exp                          |  30 +-
 pengine/test10/group6.exp                          |  36 +-
 pengine/test10/group7.exp                          |  56 +--
 pengine/test10/group8.exp                          |  22 +-
 pengine/test10/group9.exp                          |  36 +-
 pengine/test10/guest-node-host-dies.exp            |  30 +-
 pengine/test10/honor_stonith_rsc_order1.exp        |  12 +-
 pengine/test10/honor_stonith_rsc_order2.exp        |  20 +-
 pengine/test10/honor_stonith_rsc_order3.exp        |  20 +-
 pengine/test10/honor_stonith_rsc_order4.exp        |  12 +-
 pengine/test10/ignore_stonith_rsc_order1.exp       |   8 +-
 pengine/test10/ignore_stonith_rsc_order2.exp       |  12 +-
 pengine/test10/ignore_stonith_rsc_order3.exp       |  12 +-
 pengine/test10/ignore_stonith_rsc_order4.exp       |  12 +-
 pengine/test10/inc0.exp                            |  28 +-
 pengine/test10/inc1.exp                            |  40 +-
 pengine/test10/inc10.exp                           |  18 +-
 pengine/test10/inc11.exp                           |  26 +-
 pengine/test10/inc12.exp                           |  62 +--
 pengine/test10/inc2.exp                            |  20 +-
 pengine/test10/inc3.exp                            |  38 +-
 pengine/test10/inc4.exp                            |  38 +-
 pengine/test10/inc5.exp                            |  80 ++--
 pengine/test10/inc6.exp                            |  24 +-
 pengine/test10/inc7.exp                            |  88 ++--
 pengine/test10/inc8.exp                            |  50 +--
 pengine/test10/inc9.exp                            |   6 +-
 pengine/test10/interleave-0.exp                    | 324 +++++++-------
 pengine/test10/interleave-1.exp                    | 324 +++++++-------
 pengine/test10/interleave-2.exp                    | 324 +++++++-------
 pengine/test10/interleave-3.exp                    | 324 +++++++-------
 pengine/test10/interleave-pseudo-stop.exp          |  12 +-
 pengine/test10/interleave-restart.exp              |  52 +--
 pengine/test10/interleave-stop.exp                 |  26 +-
 pengine/test10/isolation-clone.exp                 |  16 +-
 pengine/test10/isolation-restart-all.exp           |  66 +--
 pengine/test10/isolation-start-all.exp             |  44 +-
 pengine/test10/load-stopped-loop-2.exp             |  68 +--
 pengine/test10/load-stopped-loop.exp               |  56 +--
 pengine/test10/location-sets-templates.exp         |  36 +-
 pengine/test10/managed-0.exp                       | 162 +++----
 pengine/test10/managed-1.exp                       | 162 +++----
 pengine/test10/managed-2.exp                       | 230 +++++-----
 pengine/test10/master-0.exp                        |  28 +-
 pengine/test10/master-1.exp                        |  30 +-
 pengine/test10/master-10.exp                       |  62 +--
 pengine/test10/master-11.exp                       |  20 +-
 pengine/test10/master-12.exp                       |   2 +-
 pengine/test10/master-13.exp                       |  34 +-
 pengine/test10/master-2.exp                        |  54 +--
 pengine/test10/master-3.exp                        |  30 +-
 pengine/test10/master-4.exp                        |  60 +--
 pengine/test10/master-5.exp                        |  54 +--
 pengine/test10/master-6.exp                        |  48 +--
 pengine/test10/master-7.exp                        |  58 +--
 pengine/test10/master-8.exp                        |  64 +--
 pengine/test10/master-9.exp                        |  38 +-
 pengine/test10/master-asymmetrical-order.exp       |   6 +-
 pengine/test10/master-colocation.exp               |   6 +-
 pengine/test10/master-demote-2.exp                 |  28 +-
 pengine/test10/master-demote-block.exp             |   2 +-
 pengine/test10/master-demote.exp                   |  16 +-
 pengine/test10/master-depend.exp                   |  22 +-
 pengine/test10/master-dependent-ban.exp            |  16 +-
 pengine/test10/master-failed-demote-2.exp          |  14 +-
 pengine/test10/master-failed-demote.exp            |  32 +-
 pengine/test10/master-group.exp                    |   6 +-
 pengine/test10/master-move.exp                     |  44 +-
 pengine/test10/master-notify.exp                   |  14 +-
 pengine/test10/master-ordering.exp                 |  50 +--
 pengine/test10/master-partially-demoted-group.exp  |  58 +--
 pengine/test10/master-probed-score.exp             | 282 ++++++-------
 pengine/test10/master-promotion-constraint.exp     |   6 +-
 pengine/test10/master-pseudo.exp                   |  18 +-
 pengine/test10/master-reattach.exp                 |  10 +-
 pengine/test10/master-role.exp                     |   2 +-
 pengine/test10/master-stop.exp                     |   2 +-
 pengine/test10/master-unmanaged-monitor.exp        |  20 +-
 pengine/test10/master_monitor_restart.exp          |   2 +-
 pengine/test10/migrate-1.exp                       |   8 +-
 pengine/test10/migrate-3.exp                       |   6 +-
 pengine/test10/migrate-4.exp                       |   4 +-
 pengine/test10/migrate-5.exp                       |   8 +-
 pengine/test10/migrate-begin.exp                   |   6 +-
 pengine/test10/migrate-both-vms.exp                |  36 +-
 pengine/test10/migrate-fail-2.exp                  |   6 +-
 pengine/test10/migrate-fail-3.exp                  |   4 +-
 pengine/test10/migrate-fail-4.exp                  |   6 +-
 pengine/test10/migrate-fail-5.exp                  |   2 +-
 pengine/test10/migrate-fail-6.exp                  |   6 +-
 pengine/test10/migrate-fail-7.exp                  |   2 +-
 pengine/test10/migrate-fail-8.exp                  |   4 +-
 pengine/test10/migrate-fail-9.exp                  |   4 +-
 pengine/test10/migrate-fencing.exp                 |  36 +-
 pengine/test10/migrate-partial-1.exp               |   2 +-
 pengine/test10/migrate-partial-2.exp               |   4 +-
 pengine/test10/migrate-partial-3.exp               |   4 +-
 pengine/test10/migrate-partial-4.exp               |  28 +-
 pengine/test10/migrate-shutdown.exp                |  42 +-
 pengine/test10/migrate-start-complex.exp           |  20 +-
 pengine/test10/migrate-start.exp                   |   8 +-
 pengine/test10/migrate-stop-complex.exp            |  14 +-
 pengine/test10/migrate-stop-start-complex.exp      |  12 +-
 pengine/test10/migrate-stop.exp                    |   8 +-
 pengine/test10/migrate-stop_start.exp              |  10 +-
 pengine/test10/minimal.exp                         |  12 +-
 pengine/test10/mon-rsc-1.exp                       |   8 +-
 pengine/test10/mon-rsc-2.exp                       |   8 +-
 pengine/test10/mon-rsc-3.exp                       |   6 +-
 pengine/test10/mon-rsc-4.exp                       |   8 +-
 pengine/test10/monitor-onfail-restart.exp          |   6 +-
 pengine/test10/monitor-onfail-stop.exp             |   2 +-
 pengine/test10/monitor-recovery.exp                |   2 +-
 pengine/test10/multi1.exp                          |   6 +-
 pengine/test10/multiple-monitor-one-failed.exp     |   8 +-
 pengine/test10/node-maintenance-1.exp              |   4 +-
 pengine/test10/node-maintenance-2.exp              |   6 +-
 pengine/test10/not-installed-agent.exp             |  12 +-
 pengine/test10/not-installed-tools.exp             |   6 +-
 pengine/test10/not-reschedule-unneeded-monitor.exp |   6 +-
 pengine/test10/notify-0.exp                        |   8 +-
 pengine/test10/notify-1.exp                        |  16 +-
 pengine/test10/notify-2.exp                        |  16 +-
 pengine/test10/notify-3.exp                        |  30 +-
 pengine/test10/novell-239079.exp                   |   8 +-
 pengine/test10/novell-239082.exp                   |  30 +-
 pengine/test10/novell-251689.exp                   |   2 +-
 pengine/test10/novell-252693-2.exp                 |  56 +--
 pengine/test10/novell-252693-3.exp                 |  62 +--
 pengine/test10/novell-252693.exp                   |  38 +-
 pengine/test10/nvpair-id-ref.exp                   |  16 +-
 pengine/test10/obsolete-lrm-resource.exp           |   6 +-
 pengine/test10/one-or-more-0.exp                   |  16 +-
 pengine/test10/one-or-more-1.exp                   |   8 +-
 pengine/test10/one-or-more-2.exp                   |  14 +-
 pengine/test10/one-or-more-3.exp                   |  10 +-
 pengine/test10/one-or-more-4.exp                   |  14 +-
 pengine/test10/one-or-more-5.exp                   |  20 +-
 pengine/test10/one-or-more-6.exp                   |   2 +-
 pengine/test10/one-or-more-7.exp                   |   2 +-
 .../test10/one-or-more-unrunnnable-instances.exp   | 464 ++++++++++-----------
 pengine/test10/order-clone.exp                     |   2 +-
 pengine/test10/order-mandatory.exp                 |   8 +-
 pengine/test10/order-optional-keyword.exp          |   2 +-
 pengine/test10/order-optional.exp                  |   2 +-
 pengine/test10/order-required.exp                  |   8 +-
 pengine/test10/order-serialize-set.exp             |  48 +--
 pengine/test10/order-serialize.exp                 |  48 +--
 pengine/test10/order-sets.exp                      |  24 +-
 pengine/test10/order-wrong-kind.exp                |   6 +-
 pengine/test10/order1.exp                          |  18 +-
 pengine/test10/order2.exp                          |  24 +-
 pengine/test10/order3.exp                          |  24 +-
 pengine/test10/order4.exp                          |  18 +-
 pengine/test10/order5.exp                          |  32 +-
 pengine/test10/order6.exp                          |  32 +-
 pengine/test10/order7.exp                          |  14 +-
 pengine/test10/order_constraint_stops_master.exp   |  14 +-
 pengine/test10/order_constraint_stops_slave.exp    |   6 +-
 pengine/test10/ordered-set-basic-startup.exp       |  14 +-
 pengine/test10/origin.exp                          |   2 +-
 pengine/test10/orphan-0.exp                        |  26 +-
 pengine/test10/orphan-1.exp                        |  34 +-
 pengine/test10/orphan-2.exp                        |  38 +-
 pengine/test10/params-0.exp                        |  30 +-
 pengine/test10/params-1.exp                        |  42 +-
 pengine/test10/params-2.exp                        |  26 +-
 pengine/test10/params-4.exp                        |  40 +-
 pengine/test10/params-5.exp                        |  42 +-
 pengine/test10/params-6.exp                        |   8 +-
 pengine/test10/per-node-attrs.exp                  |   8 +-
 pengine/test10/placement-capacity.exp              |   2 +-
 pengine/test10/placement-location.exp              |   2 +-
 pengine/test10/placement-priority.exp              |   2 +-
 pengine/test10/placement-stickiness.exp            |   2 +-
 pengine/test10/probe-0.exp                         |  12 +-
 pengine/test10/probe-1.exp                         |   6 +-
 pengine/test10/probe-2.exp                         |  70 ++--
 pengine/test10/probe-timeout.exp                   |  20 +-
 pengine/test10/quorum-1.exp                        |  14 +-
 pengine/test10/quorum-2.exp                        |  12 +-
 pengine/test10/quorum-3.exp                        |  12 +-
 pengine/test10/quorum-4.exp                        |   6 +-
 pengine/test10/quorum-5.exp                        |  12 +-
 pengine/test10/quorum-6.exp                        |  20 +-
 pengine/test10/rec-node-1.exp                      |   8 +-
 pengine/test10/rec-node-10.exp                     |   6 +-
 pengine/test10/rec-node-11.exp                     |  16 +-
 pengine/test10/rec-node-12.exp                     |  86 ++--
 pengine/test10/rec-node-15.exp                     |  44 +-
 pengine/test10/rec-node-2.exp                      |  28 +-
 pengine/test10/rec-node-3.exp                      |   8 +-
 pengine/test10/rec-node-4.exp                      |  12 +-
 pengine/test10/rec-node-5.exp                      |   8 +-
 pengine/test10/rec-node-6.exp                      |  12 +-
 pengine/test10/rec-node-7.exp                      |  12 +-
 pengine/test10/rec-node-8.exp                      |   8 +-
 pengine/test10/rec-node-9.exp                      |   4 +-
 pengine/test10/rec-rsc-0.exp                       |   4 +-
 pengine/test10/rec-rsc-1.exp                       |   6 +-
 pengine/test10/rec-rsc-2.exp                       |   8 +-
 pengine/test10/rec-rsc-3.exp                       |   4 +-
 pengine/test10/rec-rsc-4.exp                       |   2 +-
 pengine/test10/rec-rsc-5.exp                       |  12 +-
 pengine/test10/rec-rsc-6.exp                       |   6 +-
 pengine/test10/rec-rsc-7.exp                       |   4 +-
 pengine/test10/rec-rsc-9.exp                       |  12 +-
 pengine/test10/remote-disable.exp                  |   4 +-
 pengine/test10/remote-fence-before-reconnect.exp   |   6 +-
 pengine/test10/remote-fence-unclean.exp            |  22 +-
 pengine/test10/remote-move.exp                     |  14 +-
 pengine/test10/remote-orphaned.exp                 |  14 +-
 pengine/test10/remote-partial-migrate.exp          |  82 ++--
 pengine/test10/remote-partial-migrate2.exp         | 108 ++---
 pengine/test10/remote-recover-fail.exp             |  22 +-
 pengine/test10/remote-recover.exp                  |  14 +-
 pengine/test10/remote-stale-node-entry.exp         | 106 ++---
 pengine/test10/remote-start-fail.exp               |   6 +-
 pengine/test10/remote-startup-probes.exp           |  24 +-
 pengine/test10/remote-startup.exp                  |  26 +-
 pengine/test10/remote-unclean2.exp                 |   6 +-
 pengine/test10/reprobe-target_rc.exp               |   4 +-
 pengine/test10/resource-discovery.exp              | 120 +++---
 pengine/test10/rsc-discovery-per-node.exp          | 138 +++---
 pengine/test10/rsc-maintenance.exp                 |   4 +-
 pengine/test10/rsc-sets-clone-1.exp                |  64 +--
 pengine/test10/rsc-sets-clone.exp                  |  10 +-
 pengine/test10/rsc-sets-master.exp                 |  18 +-
 pengine/test10/rsc-sets-seq-false.exp              |  24 +-
 pengine/test10/rsc-sets-seq-true.exp               |  24 +-
 pengine/test10/rsc_dep1.exp                        |  12 +-
 pengine/test10/rsc_dep10.exp                       |  10 +-
 pengine/test10/rsc_dep2.exp                        |  16 +-
 pengine/test10/rsc_dep3.exp                        |  12 +-
 pengine/test10/rsc_dep4.exp                        |  20 +-
 pengine/test10/rsc_dep5.exp                        |  16 +-
 pengine/test10/rsc_dep7.exp                        |  18 +-
 pengine/test10/rsc_dep8.exp                        |  16 +-
 pengine/test10/simple11.exp                        |  12 +-
 pengine/test10/simple12.exp                        |  12 +-
 pengine/test10/simple2.exp                         |   6 +-
 pengine/test10/simple3.exp                         |   2 +-
 pengine/test10/simple4.exp                         |   2 +-
 pengine/test10/simple6.exp                         |   6 +-
 pengine/test10/simple7.exp                         |   4 +-
 pengine/test10/simple8.exp                         |   8 +-
 pengine/test10/site-specific-params.exp            |  10 +-
 pengine/test10/standby.exp                         |  48 +--
 pengine/test10/start-then-stop-with-unfence.exp    |  18 +-
 pengine/test10/stonith-0.exp                       |  22 +-
 pengine/test10/stonith-1.exp                       |  48 +--
 pengine/test10/stonith-2.exp                       |   4 +-
 pengine/test10/stonith-3.exp                       |  10 +-
 pengine/test10/stop-failure-with-fencing.exp       |   2 +-
 pengine/test10/stopped-monitor-00.exp              |  10 +-
 pengine/test10/stopped-monitor-01.exp              |   6 +-
 pengine/test10/stopped-monitor-02.exp              |  10 +-
 pengine/test10/stopped-monitor-03.exp              |   4 +-
 pengine/test10/stopped-monitor-08.exp              |  10 +-
 pengine/test10/stopped-monitor-20.exp              |   8 +-
 pengine/test10/stopped-monitor-21.exp              |   4 +-
 pengine/test10/stopped-monitor-22.exp              |   8 +-
 pengine/test10/stopped-monitor-23.exp              |   6 +-
 pengine/test10/stopped-monitor-25.exp              |   4 +-
 pengine/test10/stopped-monitor-27.exp              |   4 +-
 pengine/test10/stopped-monitor-30.exp              |   4 +-
 pengine/test10/stopped-monitor-31.exp              |   4 +-
 pengine/test10/systemhealth2.exp                   |  16 +-
 pengine/test10/systemhealth3.exp                   |  16 +-
 pengine/test10/systemhealthm2.exp                  |  16 +-
 pengine/test10/systemhealthm3.exp                  |   6 +-
 pengine/test10/systemhealthn2.exp                  |  16 +-
 pengine/test10/systemhealthn3.exp                  |  16 +-
 pengine/test10/systemhealtho2.exp                  |   6 +-
 pengine/test10/systemhealtho3.exp                  |   6 +-
 pengine/test10/systemhealthp2.exp                  |  14 +-
 pengine/test10/systemhealthp3.exp                  |   6 +-
 pengine/test10/tags-coloc-order-1.exp              |  24 +-
 pengine/test10/tags-coloc-order-2.exp              |  72 ++--
 pengine/test10/tags-location.exp                   |  36 +-
 pengine/test10/tags-ticket.exp                     |  24 +-
 pengine/test10/target-0.exp                        |  30 +-
 pengine/test10/target-1.exp                        |  26 +-
 pengine/test10/target-2.exp                        |  32 +-
 pengine/test10/template-1.exp                      |  12 +-
 pengine/test10/template-2.exp                      |  12 +-
 pengine/test10/template-3.exp                      |  20 +-
 pengine/test10/template-clone-group.exp            |  16 +-
 pengine/test10/template-clone-primitive.exp        |   8 +-
 pengine/test10/template-coloc-1.exp                |  24 +-
 pengine/test10/template-coloc-2.exp                |  24 +-
 pengine/test10/template-coloc-3.exp                |  36 +-
 pengine/test10/template-order-1.exp                |  24 +-
 pengine/test10/template-order-2.exp                |  24 +-
 pengine/test10/template-order-3.exp                |  36 +-
 pengine/test10/template-rsc-sets-1.exp             |  30 +-
 pengine/test10/template-rsc-sets-2.exp             |  30 +-
 pengine/test10/template-rsc-sets-3.exp             |  30 +-
 pengine/test10/template-rsc-sets-4.exp             |  12 +-
 pengine/test10/template-ticket.exp                 |  12 +-
 pengine/test10/ticket-clone-1.exp                  |   4 +-
 pengine/test10/ticket-clone-10.exp                 |   4 +-
 pengine/test10/ticket-clone-11.exp                 |   8 +-
 pengine/test10/ticket-clone-14.exp                 |   4 +-
 pengine/test10/ticket-clone-15.exp                 |   4 +-
 pengine/test10/ticket-clone-17.exp                 |   4 +-
 pengine/test10/ticket-clone-18.exp                 |   4 +-
 pengine/test10/ticket-clone-2.exp                  |   8 +-
 pengine/test10/ticket-clone-20.exp                 |   4 +-
 pengine/test10/ticket-clone-23.exp                 |   4 +-
 pengine/test10/ticket-clone-3.exp                  |   4 +-
 pengine/test10/ticket-clone-4.exp                  |   4 +-
 pengine/test10/ticket-clone-5.exp                  |   8 +-
 pengine/test10/ticket-clone-6.exp                  |   4 +-
 pengine/test10/ticket-clone-7.exp                  |   4 +-
 pengine/test10/ticket-clone-8.exp                  |   8 +-
 pengine/test10/ticket-group-1.exp                  |   8 +-
 pengine/test10/ticket-group-10.exp                 |   8 +-
 pengine/test10/ticket-group-11.exp                 |   8 +-
 pengine/test10/ticket-group-14.exp                 |   4 +-
 pengine/test10/ticket-group-15.exp                 |   4 +-
 pengine/test10/ticket-group-17.exp                 |   4 +-
 pengine/test10/ticket-group-18.exp                 |   4 +-
 pengine/test10/ticket-group-2.exp                  |   8 +-
 pengine/test10/ticket-group-20.exp                 |   4 +-
 pengine/test10/ticket-group-23.exp                 |   4 +-
 pengine/test10/ticket-group-3.exp                  |   4 +-
 pengine/test10/ticket-group-4.exp                  |   8 +-
 pengine/test10/ticket-group-5.exp                  |   8 +-
 pengine/test10/ticket-group-6.exp                  |   4 +-
 pengine/test10/ticket-group-7.exp                  |   8 +-
 pengine/test10/ticket-group-8.exp                  |   8 +-
 pengine/test10/ticket-master-1.exp                 |   4 +-
 pengine/test10/ticket-master-10.exp                |   8 +-
 pengine/test10/ticket-master-11.exp                |   2 +-
 pengine/test10/ticket-master-14.exp                |   6 +-
 pengine/test10/ticket-master-15.exp                |   6 +-
 pengine/test10/ticket-master-17.exp                |   2 +-
 pengine/test10/ticket-master-18.exp                |   2 +-
 pengine/test10/ticket-master-2.exp                 |   6 +-
 pengine/test10/ticket-master-20.exp                |   2 +-
 pengine/test10/ticket-master-21.exp                |   2 +-
 pengine/test10/ticket-master-23.exp                |   2 +-
 pengine/test10/ticket-master-3.exp                 |   6 +-
 pengine/test10/ticket-master-4.exp                 |   8 +-
 pengine/test10/ticket-master-5.exp                 |   2 +-
 pengine/test10/ticket-master-6.exp                 |   2 +-
 pengine/test10/ticket-master-7.exp                 |   8 +-
 pengine/test10/ticket-master-8.exp                 |   2 +-
 pengine/test10/ticket-master-9.exp                 |   2 +-
 pengine/test10/ticket-primitive-1.exp              |   4 +-
 pengine/test10/ticket-primitive-10.exp             |   4 +-
 pengine/test10/ticket-primitive-11.exp             |   4 +-
 pengine/test10/ticket-primitive-14.exp             |   2 +-
 pengine/test10/ticket-primitive-15.exp             |   2 +-
 pengine/test10/ticket-primitive-17.exp             |   2 +-
 pengine/test10/ticket-primitive-18.exp             |   2 +-
 pengine/test10/ticket-primitive-2.exp              |   4 +-
 pengine/test10/ticket-primitive-20.exp             |   2 +-
 pengine/test10/ticket-primitive-23.exp             |   2 +-
 pengine/test10/ticket-primitive-3.exp              |   2 +-
 pengine/test10/ticket-primitive-4.exp              |   4 +-
 pengine/test10/ticket-primitive-5.exp              |   4 +-
 pengine/test10/ticket-primitive-6.exp              |   2 +-
 pengine/test10/ticket-primitive-7.exp              |   4 +-
 pengine/test10/ticket-primitive-8.exp              |   4 +-
 pengine/test10/ticket-rsc-sets-1.exp               |  24 +-
 pengine/test10/ticket-rsc-sets-10.exp              |  12 +-
 pengine/test10/ticket-rsc-sets-12.exp              |   6 +-
 pengine/test10/ticket-rsc-sets-13.exp              |  12 +-
 pengine/test10/ticket-rsc-sets-14.exp              |  12 +-
 pengine/test10/ticket-rsc-sets-2.exp               |  22 +-
 pengine/test10/ticket-rsc-sets-3.exp               |  12 +-
 pengine/test10/ticket-rsc-sets-4.exp               |  24 +-
 pengine/test10/ticket-rsc-sets-5.exp               |  12 +-
 pengine/test10/ticket-rsc-sets-6.exp               |  10 +-
 pengine/test10/ticket-rsc-sets-7.exp               |  12 +-
 pengine/test10/ticket-rsc-sets-9.exp               |  12 +-
 pengine/test10/unfence-definition.exp              |  28 +-
 pengine/test10/unfence-parameters.exp              |  30 +-
 pengine/test10/unfence-startup.exp                 |  14 +-
 pengine/test10/unmanaged-block-restart.exp         |   4 +-
 pengine/test10/unmanaged-master.exp                |   4 +-
 pengine/test10/unrunnable-1.exp                    |  22 +-
 pengine/test10/use-after-free-merge.exp            |  22 +-
 pengine/test10/utilization-check-allowed-nodes.exp |  10 +-
 pengine/test10/utilization-order1.exp              |   4 +-
 pengine/test10/utilization-order2.exp              |  10 +-
 pengine/test10/utilization-order3.exp              |   8 +-
 pengine/test10/utilization-order4.exp              |  18 +-
 pengine/test10/utilization-shuffle.exp             |  24 +-
 pengine/test10/utilization.exp                     |  10 +-
 pengine/test10/whitebox-asymmetric.exp             |   8 +-
 pengine/test10/whitebox-fail1.exp                  |  18 +-
 pengine/test10/whitebox-fail2.exp                  |  18 +-
 pengine/test10/whitebox-fail3.exp                  |  18 +-
 pengine/test10/whitebox-imply-stop-on-fence.exp    |  24 +-
 pengine/test10/whitebox-migrate1.exp               |  28 +-
 pengine/test10/whitebox-move.exp                   |  22 +-
 pengine/test10/whitebox-ms-ordering-move.exp       |  18 +-
 pengine/test10/whitebox-ms-ordering.exp            |  38 +-
 pengine/test10/whitebox-nested-group.exp           |  90 ++--
 pengine/test10/whitebox-orphan-ms.exp              |  50 +--
 pengine/test10/whitebox-orphaned.exp               |  28 +-
 pengine/test10/whitebox-start.exp                  |  22 +-
 pengine/test10/whitebox-stop.exp                   |  12 +-
 pengine/test10/whitebox-unexpectedly-running.exp   |  10 +-
 604 files changed, 6494 insertions(+), 6494 deletions(-)

diff --git a/pengine/test10/1-a-then-bm-move-b.exp b/pengine/test10/1-a-then-bm-move-b.exp
index 542ddfa..b29c4ff 100644
--- a/pengine/test10/1-a-then-bm-move-b.exp
+++ b/pengine/test10/1-a-then-bm-move-b.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="10" operation="migrate_from" operation_key="B_migrate_from_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="9" operation="migrate_to" operation_key="B_migrate_to_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="B_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/10-a-then-bm-b-move-a-clone.exp b/pengine/test10/10-a-then-bm-b-move-a-clone.exp
index aa13464..c7ea7dc 100644
--- a/pengine/test10/10-a-then-bm-b-move-a-clone.exp
+++ b/pengine/test10/10-a-then-bm-b-move-a-clone.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:1_stop_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="myclone" long-id="myclone:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -43,7 +43,7 @@
     <action_set>
       <rsc_op id="12" operation="migrate_from" operation_key="vm_migrate_from_0" on_node="f20node2" on_node_uuid="2">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -56,7 +56,7 @@
     <action_set>
       <rsc_op id="11" operation="migrate_to" operation_key="vm_migrate_to_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -80,7 +80,7 @@
     <action_set>
       <rsc_op id="9" 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" />
+        <attributes CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
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
index 6126486..76652ab 100644
--- 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
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" 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" />
+        <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_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" 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" />
+        <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_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -35,7 +35,7 @@
     <action_set>
       <rsc_op id="2" 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" />
+        <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_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -101,7 +101,7 @@
     <action_set>
       <rsc_op id="10" 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" />
+        <attributes CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -117,7 +117,7 @@
     <action_set>
       <rsc_op id="9" 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" />
+        <attributes CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/1360.exp b/pengine/test10/1360.exp
index 17858ff..4db2681 100644
--- a/pengine/test10/1360.exp
+++ b/pengine/test10/1360.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="9" operation="start" operation_key="dollies:0_start_0" on_node="ssgtest1b" on_node_uuid="c728b2aa-1e73-491f-a03c-8f0598bab169">
         <primitive id="dollies" long-id="dollies:0" class="ocf" provider="gn1" type="clone_server"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="ssgtest1b" CRM_meta_on_node_uuid="c728b2aa-1e73-491f-a03c-8f0598bab169" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -19,7 +19,7 @@
      <action_set>
       <rsc_op id="8" operation="stop" operation_key="dollies:0_stop_0" on_node="ssgtest1a" on_node_uuid="94ef659b-5fd8-4d6b-b0ed-3b40339f8132">
         <primitive id="dollies" long-id="dollies:0" class="ocf" provider="gn1" type="clone_server"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="ssgtest1a" CRM_meta_on_node_uuid="94ef659b-5fd8-4d6b-b0ed-3b40339f8132" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/1484.exp b/pengine/test10/1484.exp
index 8921198..91807b8 100644
--- a/pengine/test10/1484.exp
+++ b/pengine/test10/1484.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="3" operation="stop" operation_key="the-future-of-vaj_stop_0" on_node="hb2" on_node_uuid="86ad895f-1387-461e-a9b5-c52ed9537e13">
         <primitive id="the-future-of-vaj" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000"  target_role="started"/>
+        <attributes CRM_meta_on_node="hb2" CRM_meta_on_node_uuid="86ad895f-1387-461e-a9b5-c52ed9537e13" CRM_meta_timeout="20000"  target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/1494.exp b/pengine/test10/1494.exp
index 8145b57..b5e03e9 100644
--- a/pengine/test10/1494.exp
+++ b/pengine/test10/1494.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="2" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
         <primitive id="ima_rscid: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="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  target_role="started"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hb1" CRM_meta_on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7" CRM_meta_timeout="20000"  target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/2-am-then-b-move-a.exp b/pengine/test10/2-am-then-b-move-a.exp
index a12bd6d..ed7d3fa 100644
--- a/pengine/test10/2-am-then-b-move-a.exp
+++ b/pengine/test10/2-am-then-b-move-a.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/3-am-then-bm-both-migrate.exp b/pengine/test10/3-am-then-bm-both-migrate.exp
index deecc5d..aac63ba 100644
--- a/pengine/test10/3-am-then-bm-both-migrate.exp
+++ b/pengine/test10/3-am-then-bm-both-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -69,7 +69,7 @@
     <action_set>
       <rsc_op id="13" operation="migrate_from" operation_key="B_migrate_from_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -82,7 +82,7 @@
     <action_set>
       <rsc_op id="12" operation="migrate_to" operation_key="B_migrate_to_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -95,7 +95,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="B_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -126,7 +126,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/4-am-then-bm-b-not-migratable.exp b/pengine/test10/4-am-then-bm-b-not-migratable.exp
index 7684002..66aa4ad 100644
--- a/pengine/test10/4-am-then-bm-b-not-migratable.exp
+++ b/pengine/test10/4-am-then-bm-b-not-migratable.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -73,7 +73,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="B_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -86,7 +86,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="B_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -102,7 +102,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/5-am-then-bm-a-not-migratable.exp b/pengine/test10/5-am-then-bm-a-not-migratable.exp
index 199ef39..c3bb278 100644
--- a/pengine/test10/5-am-then-bm-a-not-migratable.exp
+++ b/pengine/test10/5-am-then-bm-a-not-migratable.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="5" operation="start" operation_key="A_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="B_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="B_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="7" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
index bb15a36..5d58ab4 100644
--- a/pengine/test10/594.exp
+++ b/pengine/test10/594.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="15" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -35,7 +35,7 @@
     <action_set>
       <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -48,7 +48,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.21"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.21"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -66,7 +66,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="rsc_hadev2_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -79,7 +79,7 @@
     <action_set>
       <rsc_op id="20" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.22"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -98,7 +98,7 @@
     <action_set>
       <rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.22"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -111,7 +111,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.22"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -120,7 +120,7 @@
     <action_set>
       <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -136,7 +136,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -145,7 +145,7 @@
     <action_set>
       <rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -158,7 +158,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev3 hadev2 hadev1 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -203,7 +203,7 @@
   <synapse id="16">
     <action_set>
       <crm_event id="33" 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" />
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
         </downed>
diff --git a/pengine/test10/6-migrate-group.exp b/pengine/test10/6-migrate-group.exp
index 0041c40..23c5fae 100644
--- a/pengine/test10/6-migrate-group.exp
+++ b/pengine/test10/6-migrate-group.exp
@@ -65,7 +65,7 @@
     <action_set>
       <rsc_op id="9" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -78,7 +78,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -87,7 +87,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -118,7 +118,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -137,7 +137,7 @@
     <action_set>
       <rsc_op id="14" operation="migrate_from" operation_key="B_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -150,7 +150,7 @@
     <action_set>
       <rsc_op id="13" operation="migrate_to" operation_key="B_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -163,7 +163,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="B_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -197,7 +197,7 @@
     <action_set>
       <rsc_op id="10" operation="stop" operation_key="B_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -216,7 +216,7 @@
     <action_set>
       <rsc_op id="19" operation="migrate_from" operation_key="C_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -229,7 +229,7 @@
     <action_set>
       <rsc_op id="18" operation="migrate_to" operation_key="C_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -242,7 +242,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="C_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -276,7 +276,7 @@
     <action_set>
       <rsc_op id="15" operation="stop" operation_key="C_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp
index b18a5ea..d05f4d3 100644
--- a/pengine/test10/662.exp
+++ b/pengine/test10/662.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="22" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -21,7 +21,7 @@
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -30,7 +30,7 @@
      <action_set>
       <rsc_op id="23" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="rsc_c001n09" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -39,7 +39,7 @@
      <action_set>
       <rsc_op id="17" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n09" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -48,7 +48,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n09" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -57,7 +57,7 @@
      <action_set>
       <rsc_op id="40" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -70,7 +70,7 @@
      <action_set>
       <rsc_op id="39" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -92,7 +92,7 @@
      <action_set>
       <rsc_op id="38" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -111,7 +111,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n09" CRM_meta_on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -120,7 +120,7 @@
      <action_set>
       <rsc_op id="24" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -129,7 +129,7 @@
      <action_set>
       <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -138,7 +138,7 @@
      <action_set>
       <rsc_op id="30" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n09" CRM_meta_on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -147,7 +147,7 @@
      <action_set>
       <rsc_op id="25" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -156,7 +156,7 @@
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -165,7 +165,7 @@
      <action_set>
       <rsc_op id="31" operation="monitor" operation_key="rsc_c001n04_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
         <primitive id="rsc_c001n04" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n09" CRM_meta_on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -174,7 +174,7 @@
      <action_set>
       <rsc_op id="19" operation="monitor" operation_key="rsc_c001n04_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n04" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -183,7 +183,7 @@
      <action_set>
       <rsc_op id="45" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -202,7 +202,7 @@
      <action_set>
       <rsc_op id="32" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n09" CRM_meta_on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -211,7 +211,7 @@
      <action_set>
       <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -220,7 +220,7 @@
      <action_set>
       <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -229,7 +229,7 @@
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -238,7 +238,7 @@
      <action_set>
       <rsc_op id="33" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n09" CRM_meta_on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -247,7 +247,7 @@
      <action_set>
       <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -256,7 +256,7 @@
      <action_set>
       <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n04" CRM_meta_on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -265,7 +265,7 @@
      <action_set>
       <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -274,7 +274,7 @@
      <action_set>
       <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -305,7 +305,7 @@
   <synapse id="29">
     <action_set>
       <crm_event id="57" 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" />
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
         </downed>
diff --git a/pengine/test10/696.exp b/pengine/test10/696.exp
index 42477ab..71befb4 100644
--- a/pengine/test10/696.exp
+++ b/pengine/test10/696.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="17" operation="start" operation_key="DcIPaddr_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -32,7 +32,7 @@
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -41,7 +41,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -50,7 +50,7 @@
      <action_set>
       <rsc_op id="22" operation="monitor" operation_key="rsc_hadev1_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -63,7 +63,7 @@
      <action_set>
       <rsc_op id="21" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -82,7 +82,7 @@
      <action_set>
       <rsc_op id="20" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -98,7 +98,7 @@
      <action_set>
       <rsc_op id="9" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -107,7 +107,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -116,7 +116,7 @@
      <action_set>
       <rsc_op id="25" operation="monitor" operation_key="rsc_hadev2_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -129,7 +129,7 @@
      <action_set>
       <rsc_op id="23" operation="start" operation_key="rsc_hadev2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.0.0.12"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -145,7 +145,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -163,7 +163,7 @@
      <action_set>
       <rsc_op id="28" operation="monitor" operation_key="rsc_hadev3_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -172,7 +172,7 @@
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -181,7 +181,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
+        <attributes CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="10.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -190,7 +190,7 @@
      <action_set>
       <rsc_op id="31" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -199,7 +199,7 @@
      <action_set>
       <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -208,7 +208,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -217,7 +217,7 @@
      <action_set>
       <rsc_op id="34" operation="monitor" operation_key="child_DoFencing:1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -226,7 +226,7 @@
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -235,7 +235,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -244,7 +244,7 @@
      <action_set>
       <rsc_op id="36" operation="monitor" operation_key="child_DoFencing:2_monitor_5000" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -257,7 +257,7 @@
      <action_set>
       <rsc_op id="35" operation="start" operation_key="child_DoFencing:2_start_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -270,7 +270,7 @@
      <action_set>
       <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -279,7 +279,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -288,7 +288,7 @@
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/7-migrate-group-one-unmigratable.exp b/pengine/test10/7-migrate-group-one-unmigratable.exp
index 3988eb3..8005321 100644
--- a/pengine/test10/7-migrate-group-one-unmigratable.exp
+++ b/pengine/test10/7-migrate-group-one-unmigratable.exp
@@ -65,7 +65,7 @@
     <action_set>
       <rsc_op id="9" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -78,7 +78,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -91,7 +91,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -141,7 +141,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="B_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="11" operation="start" operation_key="B_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -173,7 +173,7 @@
     <action_set>
       <rsc_op id="10" operation="stop" operation_key="B_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -189,7 +189,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="C_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -202,7 +202,7 @@
     <action_set>
       <rsc_op id="14" operation="start" operation_key="C_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -221,7 +221,7 @@
     <action_set>
       <rsc_op id="13" operation="stop" operation_key="C_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="C" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/726.exp b/pengine/test10/726.exp
index bb9345e..a1a0be4 100644
--- a/pengine/test10/726.exp
+++ b/pengine/test10/726.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="34" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="20" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -21,7 +21,7 @@
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -30,7 +30,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -39,7 +39,7 @@
      <action_set>
       <rsc_op id="36" operation="monitor" operation_key="rsc_sgi2_monitor_5000" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -52,7 +52,7 @@
      <action_set>
       <rsc_op id="35" operation="start" operation_key="rsc_sgi2_start_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -74,7 +74,7 @@
      <action_set>
       <rsc_op id="28" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -83,7 +83,7 @@
      <action_set>
       <rsc_op id="21" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -92,7 +92,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -101,7 +101,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_sgi2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -110,7 +110,7 @@
      <action_set>
       <rsc_op id="39" operation="monitor" operation_key="rsc_ibm1_monitor_5000" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -123,7 +123,7 @@
      <action_set>
       <rsc_op id="38" operation="start" operation_key="rsc_ibm1_start_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -145,7 +145,7 @@
      <action_set>
       <rsc_op id="37" operation="stop" operation_key="rsc_ibm1_stop_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -164,7 +164,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -173,7 +173,7 @@
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -182,7 +182,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_ibm1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -191,7 +191,7 @@
      <action_set>
       <rsc_op id="41" operation="monitor" operation_key="rsc_test02_monitor_5000" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -204,7 +204,7 @@
      <action_set>
       <rsc_op id="40" operation="start" operation_key="rsc_test02_start_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -226,7 +226,7 @@
      <action_set>
       <rsc_op id="29" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -235,7 +235,7 @@
      <action_set>
       <rsc_op id="23" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -244,7 +244,7 @@
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -253,7 +253,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_test02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -262,7 +262,7 @@
      <action_set>
       <rsc_op id="44" operation="monitor" operation_key="rsc_test03_monitor_5000" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="rsc_test03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -271,7 +271,7 @@
      <action_set>
       <rsc_op id="24" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="rsc_test03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -280,7 +280,7 @@
      <action_set>
       <rsc_op id="15" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="rsc_test03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -289,7 +289,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="rsc_test03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -298,7 +298,7 @@
      <action_set>
       <rsc_op id="47" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -311,7 +311,7 @@
      <action_set>
       <rsc_op id="45" operation="start" operation_key="child_DoFencing:0_start_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -324,7 +324,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -333,7 +333,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -342,7 +342,7 @@
     <action_set>
       <rsc_op id="50" operation="monitor" operation_key="child_DoFencing:1_monitor_5000" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -355,7 +355,7 @@
      <action_set>
       <rsc_op id="48" operation="start" operation_key="child_DoFencing:1_start_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -368,7 +368,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -377,7 +377,7 @@
      <action_set>
       <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -386,7 +386,7 @@
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -395,7 +395,7 @@
      <action_set>
       <rsc_op id="52" operation="monitor" operation_key="child_DoFencing:2_monitor_5000" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -408,7 +408,7 @@
      <action_set>
       <rsc_op id="51" operation="start" operation_key="child_DoFencing:2_start_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -421,7 +421,7 @@
      <action_set>
       <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -430,7 +430,7 @@
      <action_set>
       <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -439,7 +439,7 @@
      <action_set>
       <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -448,7 +448,7 @@
      <action_set>
       <rsc_op id="9" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -457,7 +457,7 @@
      <action_set>
       <rsc_op id="54" operation="monitor" operation_key="child_DoFencing:3_monitor_5000" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -470,7 +470,7 @@
      <action_set>
       <rsc_op id="53" operation="start" operation_key="child_DoFencing:3_start_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -483,7 +483,7 @@
      <action_set>
       <rsc_op id="31" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -492,7 +492,7 @@
      <action_set>
       <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="test02" CRM_meta_on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -501,7 +501,7 @@
      <action_set>
       <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="sgi2" CRM_meta_on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -510,7 +510,7 @@
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="ibm1" CRM_meta_on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="sgi2 ibm1 test02 test03 "/>
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/735.exp b/pengine/test10/735.exp
index 10bc0d9..b5f89bf 100644
--- a/pengine/test10/735.exp
+++ b/pengine/test10/735.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc_hadev1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -25,7 +25,7 @@
      <action_set>
       <rsc_op id="11" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -34,7 +34,7 @@
      <action_set>
       <rsc_op id="10" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -47,7 +47,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev2" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -56,7 +56,7 @@
      <action_set>
       <rsc_op id="16" operation="monitor" operation_key="rsc_hadev3_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -69,7 +69,7 @@
     <action_set>
       <rsc_op id="15" operation="start" operation_key="rsc_hadev3_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="rsc_hadev3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -78,7 +78,7 @@
      <action_set>
       <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -91,7 +91,7 @@
      <action_set>
       <rsc_op id="17" operation="start" operation_key="child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -104,7 +104,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -113,7 +113,7 @@
      <action_set>
       <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -126,7 +126,7 @@
      <action_set>
       <rsc_op id="19" operation="start" operation_key="child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -139,7 +139,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/764.exp b/pengine/test10/764.exp
index 4f9aa06..5101644 100644
--- a/pengine/test10/764.exp
+++ b/pengine/test10/764.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="13" operation="stop" operation_key="DcIPaddr_stop_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -25,7 +25,7 @@
      <action_set>
       <rsc_op id="15" operation="stop" operation_key="rsc_posic041_stop_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="rsc_posic041" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
      <action_set>
       <rsc_op id="9" operation="monitor" operation_key="rsc_posic041_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="rsc_posic041" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -47,7 +47,7 @@
      <action_set>
       <rsc_op id="17" operation="stop" operation_key="rsc_posic042_stop_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="rsc_posic042" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -60,7 +60,7 @@
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="rsc_posic042_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="rsc_posic042" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -69,7 +69,7 @@
      <action_set>
       <rsc_op id="20" operation="stop" operation_key="rsc_posic043_stop_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="rsc_posic043" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -82,7 +82,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="rsc_posic043_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="rsc_posic043" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -91,7 +91,7 @@
      <action_set>
       <rsc_op id="23" operation="stop" operation_key="rsc_posic044_stop_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="rsc_posic044" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -104,7 +104,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="rsc_posic044_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="rsc_posic044" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -113,7 +113,7 @@
      <action_set>
       <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -122,7 +122,7 @@
      <action_set>
       <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:1_monitor_5000" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -131,7 +131,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -140,7 +140,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -149,7 +149,7 @@
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="posic041 posic042 posic043 posic044 "/>
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp
index 6126a4c..51f64cb 100644
--- a/pengine/test10/797.exp
+++ b/pengine/test10/797.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
        <rsc_op id="11" operation="delete" operation_key="DcIPaddr_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -34,7 +34,7 @@
      <action_set>
       <rsc_op id="10" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -47,7 +47,7 @@
      <action_set>
       <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -63,7 +63,7 @@
      <action_set>
       <rsc_op id="21" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -72,7 +72,7 @@
      <action_set>
       <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -81,7 +81,7 @@
     <action_set>
       <rsc_op id="29" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -97,7 +97,7 @@
      <action_set>
       <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -106,7 +106,7 @@
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -115,7 +115,7 @@
      <action_set>
       <rsc_op id="32" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -128,7 +128,7 @@
      <action_set>
       <rsc_op id="19" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -137,7 +137,7 @@
      <action_set>
       <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -146,7 +146,7 @@
      <action_set>
       <rsc_op id="34" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -159,7 +159,7 @@
      <action_set>
       <rsc_op id="23" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -168,7 +168,7 @@
      <action_set>
       <rsc_op id="38" operation="start" operation_key="child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -187,7 +187,7 @@
      <action_set>
       <rsc_op id="37" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -200,7 +200,7 @@
      <action_set>
       <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -213,7 +213,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="child_DoFencing:0_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_requires="nothing" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -226,7 +226,7 @@
      <action_set>
       <rsc_op id="39" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -239,7 +239,7 @@
      <action_set>
       <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -248,7 +248,7 @@
      <action_set>
       <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -257,7 +257,7 @@
      <action_set>
       <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -266,7 +266,7 @@
      <action_set>
       <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -342,7 +342,7 @@
   <synapse id="28">
      <action_set>
       <crm_event id="47" 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" />
+        <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
         </downed>
diff --git a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp
index 2c64ae6..6fb28d5 100644
--- a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp
+++ b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -73,7 +73,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
index 5975a6b..115a39f 100644
--- a/pengine/test10/829.exp
+++ b/pengine/test10/829.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -30,7 +30,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.11"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="32" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -52,7 +52,7 @@
     <action_set>
       <rsc_op id="31" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -98,7 +98,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -107,7 +107,7 @@
     <action_set>
       <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -116,7 +116,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -125,7 +125,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -134,7 +134,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
+        <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -143,7 +143,7 @@
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -152,7 +152,7 @@
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
+        <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -179,7 +179,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -188,7 +188,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:1" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -197,7 +197,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -206,7 +206,7 @@
     <action_set>
       <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -215,7 +215,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -224,7 +224,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <primitive id="child_DoFencing:3" class="stonith" type="ssh"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  hostlist="c001n08 c001n02 c001n03 c001n01 "/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp
index 759a28f..10f0f8c 100644
--- a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp
+++ b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/994-2.exp b/pengine/test10/994-2.exp
index 1d8def6..c00f2f2 100644
--- a/pengine/test10/994-2.exp
+++ b/pengine/test10/994-2.exp
@@ -57,7 +57,7 @@
      <action_set>
       <rsc_op id="13" operation="start" operation_key="postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -73,7 +73,7 @@
      <action_set>
        <rsc_op id="3" operation="stop" operation_key="postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -86,7 +86,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="postfix_9_monitor_120000" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="60000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -99,7 +99,7 @@
      <action_set>
       <rsc_op id="19" operation="start" operation_key="depends_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="depends" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -115,7 +115,7 @@
     <action_set>
       <rsc_op id="18" operation="stop" operation_key="depends_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="depends" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/994.exp b/pengine/test10/994.exp
index ddc7551..b0111ff 100644
--- a/pengine/test10/994.exp
+++ b/pengine/test10/994.exp
@@ -53,7 +53,7 @@
      <action_set>
       <rsc_op id="13" operation="start" operation_key="postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -69,7 +69,7 @@
      <action_set>
        <rsc_op id="3" operation="stop" operation_key="postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -82,7 +82,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="postfix_9_monitor_120000" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
         <primitive id="postfix_9" class="lsb" type="postfix"/>
-        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="paul" CRM_meta_on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" CRM_meta_timeout="60000" />
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/a-demote-then-b-migrate.exp b/pengine/test10/a-demote-then-b-migrate.exp
index f75ca52..32ee3f9 100644
--- a/pengine/test10/a-demote-then-b-migrate.exp
+++ b/pengine/test10/a-demote-then-b-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="rsc1:1_monitor_10000" internal_operation_key="rsc1:0_monitor_10000" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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_interval="10000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -74,7 +74,7 @@
     <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -90,7 +90,7 @@
     <action_set>
       <rsc_op id="1" operation="cancel" operation_key="rsc1:1_monitor_5000" internal_operation_key="rsc1:0_monitor_5000" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:1" 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_interval="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Master" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_operation="monitor" CRM_meta_role="Master" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -99,7 +99,7 @@
     <action_set>
       <rsc_op id="59" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -112,7 +112,7 @@
     <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -125,7 +125,7 @@
     <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -138,7 +138,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -151,7 +151,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc1:0_monitor_5000" internal_operation_key="rsc1:1_monitor_5000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -170,7 +170,7 @@
     <action_set>
       <rsc_op id="11" operation="promote" operation_key="rsc1:0_promote_0" internal_operation_key="rsc1:1_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -186,7 +186,7 @@
     <action_set>
       <rsc_op id="3" operation="cancel" operation_key="rsc1:0_monitor_10000" internal_operation_key="rsc1:1_monitor_10000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -374,7 +374,7 @@
     <action_set>
       <rsc_op id="41" operation="migrate_from" operation_key="rsc2_migrate_from_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -387,7 +387,7 @@
     <action_set>
       <rsc_op id="40" operation="migrate_to" operation_key="rsc2_migrate_to_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -400,7 +400,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -428,7 +428,7 @@
     <action_set>
       <rsc_op id="37" 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" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/a-promote-then-b-migrate.exp b/pengine/test10/a-promote-then-b-migrate.exp
index e527de6..727036a 100644
--- a/pengine/test10/a-promote-then-b-migrate.exp
+++ b/pengine/test10/a-promote-then-b-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="rsc1:1_monitor_5000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1: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="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="5000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="11" operation="promote" operation_key="rsc1:1_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -87,7 +87,7 @@
     <action_set>
       <rsc_op id="3" operation="cancel" operation_key="rsc1:1_monitor_10000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -179,7 +179,7 @@
     <action_set>
       <rsc_op id="41" operation="migrate_from" operation_key="rsc2_migrate_from_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -192,7 +192,7 @@
     <action_set>
       <rsc_op id="40" operation="migrate_to" operation_key="rsc2_migrate_to_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="node1" CRM_meta_migrate_target="node2" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -205,7 +205,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -236,7 +236,7 @@
     <action_set>
       <rsc_op id="37" 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" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/anti-colocation-master.exp b/pengine/test10/anti-colocation-master.exp
index 00e20b1..011bfdd 100644
--- a/pengine/test10/anti-colocation-master.exp
+++ b/pengine/test10/anti-colocation-master.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="start" operation_key="dummy1_start_0" on_node="sle12sp2-1" on_node_uuid="1084783155">
         <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="sle12sp2-1" CRM_meta_on_node_uuid="1084783155" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="dummy1_stop_0" on_node="sle12sp2-2" on_node_uuid="1084783156">
         <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="sle12sp2-2" CRM_meta_on_node_uuid="1084783156" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="8" operation="promote" operation_key="state1_promote_0" internal_operation_key="state1:0_promote_0" on_node="sle12sp2-2" on_node_uuid="1084783156">
         <primitive id="state1" long-id="state1: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" />
+        <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_on_node="sle12sp2-2" CRM_meta_on_node_uuid="1084783156" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -41,7 +41,7 @@
     <action_set>
       <rsc_op id="10" operation="demote" operation_key="state1_demote_0" internal_operation_key="state1:1_demote_0" on_node="sle12sp2-1" on_node_uuid="1084783155">
         <primitive id="state1" long-id="state1: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" />
+        <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_on_node="sle12sp2-1" CRM_meta_on_node_uuid="1084783155" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/anti-colocation-order.exp b/pengine/test10/anti-colocation-order.exp
index 24de4d2..fa5304f 100644
--- a/pengine/test10/anti-colocation-order.exp
+++ b/pengine/test10/anti-colocation-order.exp
@@ -62,7 +62,7 @@
     <action_set>
       <rsc_op id="3" 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" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -78,7 +78,7 @@
     <action_set>
       <rsc_op id="2" 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" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -94,7 +94,7 @@
     <action_set>
       <rsc_op id="5" 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" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -113,7 +113,7 @@
     <action_set>
       <rsc_op id="4" 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" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -152,7 +152,7 @@
     <action_set>
       <rsc_op id="10" 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" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -168,7 +168,7 @@
     <action_set>
       <rsc_op id="11" 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" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/anti-colocation-slave.exp b/pengine/test10/anti-colocation-slave.exp
index afb8983..dc3eb08 100644
--- a/pengine/test10/anti-colocation-slave.exp
+++ b/pengine/test10/anti-colocation-slave.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="demote" operation_key="state1_demote_0" internal_operation_key="state1:0_demote_0" on_node="sle12sp2-1" on_node_uuid="1084783155">
         <primitive id="state1" long-id="state1: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" />
+        <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_on_node="sle12sp2-1" CRM_meta_on_node_uuid="1084783155" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="9" operation="promote" operation_key="state1_promote_0" internal_operation_key="state1:1_promote_0" on_node="sle12sp2-2" on_node_uuid="1084783156">
         <primitive id="state1" long-id="state1: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" />
+        <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_on_node="sle12sp2-2" CRM_meta_on_node_uuid="1084783156" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -80,7 +80,7 @@
     <action_set>
       <rsc_op id="19" operation="start" operation_key="dummy1_start_0" on_node="sle12sp2-2" on_node_uuid="1084783156">
         <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="sle12sp2-2" CRM_meta_on_node_uuid="1084783156" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <rsc_op id="18" operation="stop" operation_key="dummy1_stop_0" on_node="sle12sp2-1" on_node_uuid="1084783155">
         <primitive id="dummy1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="sle12sp2-1" CRM_meta_on_node_uuid="1084783155" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/asymmetric.exp b/pengine/test10/asymmetric.exp
index a18ba0a..6284925 100644
--- a/pengine/test10/asymmetric.exp
+++ b/pengine/test10/asymmetric.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:1_monitor_19000" internal_operation_key="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:0_monitor_19000" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a">
         <primitive id="ebe3fb6e-7778-426e-be58-190ab1ff3dd3" long-id="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="19000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_role="Slave" CRM_meta_timeout="10000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="19000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="puma1" CRM_meta_on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a" CRM_meta_role="Slave" CRM_meta_timeout="10000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="11" operation="monitor" operation_key="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:0_monitor_20000" internal_operation_key="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:1_monitor_20000" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3">
         <primitive id="ebe3fb6e-7778-426e-be58-190ab1ff3dd3" long-id="ebe3fb6e-7778-426e-be58-190ab1ff3dd3:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="20000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="10000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="20000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="puma3" CRM_meta_on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="10000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -21,7 +21,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="drbd_target_poolA_monitor_0" on_node="puma3" on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3">
         <primitive id="drbd_target_poolA" class="ocf" provider="vpools" type="iscsi_target"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA" ip="192.168.5.1" nexus_iqn="iqn.2008-05.fr.longphone:poolA" target_role="started"/>
+        <attributes CRM_meta_on_node="puma3" CRM_meta_on_node_uuid="d61fe2cb-98f0-4815-9b7e-2552f5330ad3" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA" ip="192.168.5.1" nexus_iqn="iqn.2008-05.fr.longphone:poolA" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -30,7 +30,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="drbd_target_poolA_monitor_0" on_node="puma1" on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a">
         <primitive id="drbd_target_poolA" class="ocf" provider="vpools" type="iscsi_target"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA" ip="192.168.5.1" nexus_iqn="iqn.2008-05.fr.longphone:poolA" target_role="started"/>
+        <attributes CRM_meta_on_node="puma1" CRM_meta_on_node_uuid="c1b88737-8c7c-4824-81de-843fe7f2e88a" CRM_meta_op_target_rc="7" CRM_meta_timeout="40000"  drbd_resource="poolA" drbdconf="/etc/drbd.poolA" ip="192.168.5.1" nexus_iqn="iqn.2008-05.fr.longphone:poolA" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/asymmetrical-order-move.exp b/pengine/test10/asymmetrical-order-move.exp
index 458094f..ac48583 100644
--- a/pengine/test10/asymmetrical-order-move.exp
+++ b/pengine/test10/asymmetrical-order-move.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="dummy2_stop_0" on_node="sle12sp2-1" on_node_uuid="1084783155">
         <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="sle12sp2-1" CRM_meta_on_node_uuid="1084783155" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs1.exp b/pengine/test10/attrs1.exp
index 69f93df..7df2479 100644
--- a/pengine/test10/attrs1.exp
+++ b/pengine/test10/attrs1.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs2.exp b/pengine/test10/attrs2.exp
index 69f93df..7df2479 100644
--- a/pengine/test10/attrs2.exp
+++ b/pengine/test10/attrs2.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs3.exp b/pengine/test10/attrs3.exp
index 52309b8..d86378f 100644
--- a/pengine/test10/attrs3.exp
+++ b/pengine/test10/attrs3.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs4.exp b/pengine/test10/attrs4.exp
index 52309b8..d86378f 100644
--- a/pengine/test10/attrs4.exp
+++ b/pengine/test10/attrs4.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs5.exp b/pengine/test10/attrs5.exp
index 7d7b6c4..f74da82 100644
--- a/pengine/test10/attrs5.exp
+++ b/pengine/test10/attrs5.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs/>
@@ -12,7 +12,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/attrs6.exp b/pengine/test10/attrs6.exp
index 52309b8..d86378f 100644
--- a/pengine/test10/attrs6.exp
+++ b/pengine/test10/attrs6.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs7.exp b/pengine/test10/attrs7.exp
index 69f93df..7df2479 100644
--- a/pengine/test10/attrs7.exp
+++ b/pengine/test10/attrs7.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/attrs8.exp b/pengine/test10/attrs8.exp
index 69f93df..7df2479 100644
--- a/pengine/test10/attrs8.exp
+++ b/pengine/test10/attrs8.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
         <primitive id="rsc1" class="heartbeat" type="apache"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/balanced.exp b/pengine/test10/balanced.exp
index db8d65b..cfe66f8 100644
--- a/pengine/test10/balanced.exp
+++ b/pengine/test10/balanced.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="host2" on_node_uuid="host2">
         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host2" CRM_meta_on_node_uuid="host2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -22,7 +22,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="host2" on_node_uuid="host2">
         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host2" CRM_meta_on_node_uuid="host2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -31,7 +31,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="host1" on_node_uuid="host1">
         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host1" CRM_meta_on_node_uuid="host1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -40,7 +40,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="rsc2_start_0" on_node="host1" on_node_uuid="host1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host1" CRM_meta_on_node_uuid="host1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -59,7 +59,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="host2" on_node_uuid="host2">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host2" CRM_meta_on_node_uuid="host2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="host1" on_node_uuid="host1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="host1" CRM_meta_on_node_uuid="host1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/base-score.exp b/pengine/test10/base-score.exp
index baa4f77..a13d02f 100644
--- a/pengine/test10/base-score.exp
+++ b/pengine/test10/base-score.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="6" operation="start" operation_key="Dummy_start_0" on_node="puma1" on_node_uuid="puma1">
         <primitive id="Dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="puma1" CRM_meta_on_node_uuid="puma1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="Dummy_monitor_0" on_node="puma4" on_node_uuid="puma4">
         <primitive id="Dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="puma4" CRM_meta_on_node_uuid="puma4" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -34,7 +34,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="Dummy_monitor_0" on_node="puma3" on_node_uuid="puma3">
         <primitive id="Dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="puma3" CRM_meta_on_node_uuid="puma3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -43,7 +43,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="Dummy_monitor_0" on_node="puma2" on_node_uuid="puma2">
         <primitive id="Dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="puma2" CRM_meta_on_node_uuid="puma2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -52,7 +52,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="Dummy_monitor_0" on_node="puma1" on_node_uuid="puma1">
         <primitive id="Dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="puma1" CRM_meta_on_node_uuid="puma1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bnc-515172.exp b/pengine/test10/bnc-515172.exp
index 45fc9b8..4086cff 100644
--- a/pengine/test10/bnc-515172.exp
+++ b/pengine/test10/bnc-515172.exp
@@ -26,7 +26,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="PRIM_Web_IP1_monitor_5000" on_node="sles11-ha2" on_node_uuid="sles11-ha2">
         <primitive id="PRIM_Web_IP1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_start_delay="1000" CRM_meta_timeout="5000"  ip="192.168.2.45"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sles11-ha2" CRM_meta_on_node_uuid="sles11-ha2" CRM_meta_start_delay="1000" CRM_meta_timeout="5000"  ip="192.168.2.45"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="21" operation="start" operation_key="PRIM_Web_IP1_start_0" on_node="sles11-ha2" on_node_uuid="sles11-ha2">
         <primitive id="PRIM_Web_IP1" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000"  ip="192.168.2.45"/>
+        <attributes CRM_meta_on_node="sles11-ha2" CRM_meta_on_node_uuid="sles11-ha2" CRM_meta_timeout="20000"  ip="192.168.2.45"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-1572-1.exp b/pengine/test10/bug-1572-1.exp
index 27e773c..e5355d8 100644
--- a/pengine/test10/bug-1572-1.exp
+++ b/pengine/test10/bug-1572-1.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="51" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="5" operation="stop" operation_key="rsc_drbd_7788:0_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -81,7 +81,7 @@
      <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -94,7 +94,7 @@
      <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -107,7 +107,7 @@
      <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -120,7 +120,7 @@
      <action_set>
       <rsc_op id="50" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -133,7 +133,7 @@
      <action_set>
       <rsc_op id="8" operation="promote" operation_key="rsc_drbd_7788:1_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -152,7 +152,7 @@
      <action_set>
       <rsc_op id="7" operation="stop" operation_key="rsc_drbd_7788:1_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -168,7 +168,7 @@
      <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc_drbd_7788:1_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -181,7 +181,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc_drbd_7788:1_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -627,7 +627,7 @@
      <action_set>
       <rsc_op id="34" operation="start" operation_key="fs_mirror_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="fs_mirror" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -643,7 +643,7 @@
      <action_set>
       <rsc_op id="33" operation="stop" operation_key="fs_mirror_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="fs_mirror" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -659,7 +659,7 @@
      <action_set>
       <rsc_op id="36" operation="start" operation_key="pgsql_5555_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="pgsql_5555" class="ocf" provider="heartbeat" type="pgsql"/>
-        <attributes CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -678,7 +678,7 @@
      <action_set>
       <rsc_op id="35" operation="stop" operation_key="pgsql_5555_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="pgsql_5555" class="ocf" provider="heartbeat" type="pgsql"/>
-        <attributes CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -694,7 +694,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="pgsql_5555_monitor_30000" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="pgsql_5555" class="ocf" provider="heartbeat" type="pgsql"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_start_delay="10000" CRM_meta_timeout="30000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_start_delay="10000" CRM_meta_timeout="30000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -707,7 +707,7 @@
      <action_set>
       <rsc_op id="38" operation="start" operation_key="IPaddr_147_81_84_133_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="120000"  ip="147.81.84.133"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  ip="147.81.84.133"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -726,7 +726,7 @@
      <action_set>
       <rsc_op id="37" operation="stop" operation_key="IPaddr_147_81_84_133_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="120000"  ip="147.81.84.133"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  ip="147.81.84.133"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -739,7 +739,7 @@
      <action_set>
       <rsc_op id="1" operation="monitor" operation_key="IPaddr_147_81_84_133_monitor_25000" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_enabled="true" CRM_meta_interval="25000" CRM_meta_name="monitor" CRM_meta_role="Started" CRM_meta_start_delay="0" CRM_meta_timeout="25000"  ip="147.81.84.133"/>
+        <attributes CRM_meta_enabled="true" CRM_meta_interval="25000" CRM_meta_name="monitor" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_role="Started" CRM_meta_start_delay="0" CRM_meta_timeout="25000"  ip="147.81.84.133"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -751,7 +751,7 @@
   <synapse id="50">
     <action_set>
       <crm_event id="44" 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" />
+        <attributes CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="8c16c69e-f753-49cf-ba89-3ae421940042"/>
         </downed>
diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp
index 6193c86..e346e2b 100644
--- a/pengine/test10/bug-1572-2.exp
+++ b/pengine/test10/bug-1572-2.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="4" operation="stop" operation_key="rsc_drbd_7788:0_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -81,7 +81,7 @@
      <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -94,7 +94,7 @@
      <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -107,7 +107,7 @@
      <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc_drbd_7788:1_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -328,7 +328,7 @@
      <action_set>
       <rsc_op id="32" operation="stop" operation_key="fs_mirror_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="fs_mirror" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  device="/dev/drbd0" directory="/mirror" fstype="ext3" notify="true"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -344,7 +344,7 @@
      <action_set>
       <rsc_op id="33" operation="stop" operation_key="pgsql_5555_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="pgsql_5555" class="ocf" provider="heartbeat" type="pgsql"/>
-        <attributes CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  logfile="/var/log/pg.log" pgctl="/usr/local/pgsql/bin/pg_ctl" pgdata="/mirror/pgsql/data_hb" pgdba="postgres" pgport="5555" psql="/usr/local/pgsql/bin/psql" start_opt="-p 5555"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -360,7 +360,7 @@
      <action_set>
       <rsc_op id="34" operation="stop" operation_key="IPaddr_147_81_84_133_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="120000"  ip="147.81.84.133"/>
+        <attributes CRM_meta_on_node="arc-tkincaidlx.wsicorp.com" CRM_meta_on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" CRM_meta_timeout="120000"  ip="147.81.84.133"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -372,7 +372,7 @@
    <synapse id="26">
      <action_set>
       <crm_event id="40" 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" />
+        <attributes CRM_meta_on_node="arc-dknightlx" CRM_meta_on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="8c16c69e-f753-49cf-ba89-3ae421940042"/>
         </downed>
diff --git a/pengine/test10/bug-1573.exp b/pengine/test10/bug-1573.exp
index 651d263..79700fc 100644
--- a/pengine/test10/bug-1573.exp
+++ b/pengine/test10/bug-1573.exp
@@ -26,7 +26,7 @@
      <action_set>
       <rsc_op id="7" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="xen-b" on_node_uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2">
         <primitive id="IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="15000"  ip="192.168.1.102"/>
+        <attributes CRM_meta_on_node="xen-b" CRM_meta_on_node_uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2" CRM_meta_timeout="15000"  ip="192.168.1.102"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
    <synapse id="3">
      <action_set>
       <crm_event id="13" 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" />
+        <attributes CRM_meta_on_node="xen-b" CRM_meta_on_node_uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="6a0b1629-ab27-47c7-a6a4-461c94e477f2"/>
         </downed>
diff --git a/pengine/test10/bug-1685.exp b/pengine/test10/bug-1685.exp
index f16040b..16ff43b 100644
--- a/pengine/test10/bug-1685.exp
+++ b/pengine/test10/bug-1685.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="48" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="47" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="4" operation="promote" operation_key="prim_shared_storage:0_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="50" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="redun1" CRM_meta_on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="49" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="redun1" CRM_meta_on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13" CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="prim_shared_storage:1_monitor_120000" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_timeout="60000"  drbd_resource="sip-shared"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="redun1" CRM_meta_on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13" CRM_meta_timeout="60000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -164,7 +164,7 @@
      <action_set>
       <rsc_op id="33" operation="monitor" operation_key="shared_filesystem_monitor_120000" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="shared_filesystem" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_timeout="60000"  device="/dev/drbd0" directory="/shared" fstype="reiserfs"/>
+        <attributes CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_on_node="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="60000"  device="/dev/drbd0" directory="/shared" fstype="reiserfs"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -177,7 +177,7 @@
      <action_set>
       <rsc_op id="32" operation="start" operation_key="shared_filesystem_start_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="shared_filesystem" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000"  device="/dev/drbd0" directory="/shared" fstype="reiserfs"/>
+        <attributes CRM_meta_on_node="redun2" CRM_meta_on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" CRM_meta_timeout="20000"  device="/dev/drbd0" directory="/shared" fstype="reiserfs"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-1718.exp b/pengine/test10/bug-1718.exp
index 13e6bda..7c5db02 100644
--- a/pengine/test10/bug-1718.exp
+++ b/pengine/test10/bug-1718.exp
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="13" operation="stop" operation_key="resource_IP3_stop_0" on_node="ops.ds9" on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad">
         <primitive id="resource_IP3" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000" broadcast="10.0.0.255" cidr_netmask="255.255.255.0"  ip="10.0.0.68" target_role="started"/>
+        <attributes CRM_meta_on_node="ops.ds9" CRM_meta_on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad" CRM_meta_timeout="20000" broadcast="10.0.0.255" cidr_netmask="255.255.255.0"  ip="10.0.0.68" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -45,7 +45,7 @@
      <action_set>
       <rsc_op id="15" operation="stop" operation_key="resource_dummy_stop_0" on_node="ops.ds9" on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad">
         <primitive id="resource_dummy" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000"  target_role="started"/>
+        <attributes CRM_meta_on_node="ops.ds9" CRM_meta_on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad" CRM_meta_timeout="20000"  target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -58,7 +58,7 @@
      <action_set>
       <rsc_op id="4" operation="delete" operation_key="OpenVPN_IP_delete_0" on_node="ops.ds9" on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad">
         <primitive id="OpenVPN_IP" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="ops.ds9" CRM_meta_on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -67,7 +67,7 @@
     <action_set>
       <rsc_op id="2" operation="delete" operation_key="OpenVPN_IP_delete_0" on_node="heartbeat.ds9" on_node_uuid="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57">
         <primitive id="OpenVPN_IP" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="heartbeat.ds9" CRM_meta_on_node_uuid="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -76,7 +76,7 @@
     <action_set>
       <rsc_op id="6" operation="delete" operation_key="Apache_delete_0" on_node="biggame.ds9" on_node_uuid="de2a634c-e405-42bb-9df2-292e36ad5970">
         <primitive id="Apache" class="ocf" provider="heartbeat" type="apache13"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="biggame.ds9" CRM_meta_on_node_uuid="de2a634c-e405-42bb-9df2-292e36ad5970" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -85,7 +85,7 @@
     <action_set>
       <rsc_op id="5" operation="delete" operation_key="Apache_delete_0" on_node="ops.ds9" on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad">
         <primitive id="Apache" class="ocf" provider="heartbeat" type="apache13"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="ops.ds9" CRM_meta_on_node_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -94,7 +94,7 @@
     <action_set>
       <rsc_op id="3" operation="delete" operation_key="Apache_delete_0" on_node="heartbeat.ds9" on_node_uuid="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57">
         <primitive id="Apache" class="ocf" provider="heartbeat" type="apache13"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="heartbeat.ds9" CRM_meta_on_node_uuid="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-1765.exp b/pengine/test10/bug-1765.exp
index 4b8d04b..2c01402 100644
--- a/pengine/test10/bug-1765.exp
+++ b/pengine/test10/bug-1765.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="75" operation="notify" operation_key="drbd0:0_post_notify_start_0" on_node="sles236" on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="sles236" CRM_meta_on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="74" operation="notify" operation_key="drbd0:0_pre_notify_start_0" on_node="sles236" on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="sles236" CRM_meta_on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="76" operation="notify" operation_key="drbd0:1_post_notify_start_0" on_node="sles238" on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="sles238" CRM_meta_on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="9" operation="start" operation_key="drbd0:1_start_0" on_node="sles238" on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="sles238" CRM_meta_on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-1820-1.exp b/pengine/test10/bug-1820-1.exp
index 03e5a08..7a41069 100644
--- a/pengine/test10/bug-1820-1.exp
+++ b/pengine/test10/bug-1820-1.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="6" operation="start" operation_key="p1_start_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="p1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="p1_monitor_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="p1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="p1_monitor_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="p1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
@@ -93,7 +93,7 @@
      <action_set>
       <rsc_op id="11" operation="migrate_from" operation_key="test1_migrate_from_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -106,7 +106,7 @@
      <action_set>
       <rsc_op id="10" operation="migrate_to" operation_key="test1_migrate_to_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -115,7 +115,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="test1_monitor_10000" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -146,7 +146,7 @@
      <action_set>
       <rsc_op id="7" operation="stop" operation_key="test1_stop_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_name="stop" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -165,7 +165,7 @@
      <action_set>
       <rsc_op id="16" operation="migrate_from" operation_key="test2_migrate_from_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -178,7 +178,7 @@
      <action_set>
       <rsc_op id="15" operation="migrate_to" operation_key="test2_migrate_to_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -191,7 +191,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="test2_monitor_10000" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -225,7 +225,7 @@
      <action_set>
       <rsc_op id="12" operation="stop" operation_key="test2_stop_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_name="stop" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -240,7 +240,7 @@
   <synapse id="17">
      <action_set>
       <crm_event id="22" 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" />
+        <attributes CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="3f368213-61d5-409a-a30e-1428efe70f63"/>
         </downed>
diff --git a/pengine/test10/bug-1820.exp b/pengine/test10/bug-1820.exp
index 4ec4a4d..35c0e65 100644
--- a/pengine/test10/bug-1820.exp
+++ b/pengine/test10/bug-1820.exp
@@ -59,7 +59,7 @@
      <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="test1_migrate_from_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -72,7 +72,7 @@
      <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="test1_migrate_to_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
       </rsc_op>
      </action_set>
     <inputs/>
@@ -81,7 +81,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="test1_monitor_10000" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -112,7 +112,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="test1_stop_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test1" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_name="stop" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -131,7 +131,7 @@
     <action_set>
       <rsc_op id="13" operation="migrate_from" operation_key="test2_migrate_from_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -144,7 +144,7 @@
      <action_set>
       <rsc_op id="12" operation="migrate_to" operation_key="test2_migrate_to_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_migrate_source="star" CRM_meta_migrate_target="world" CRM_meta_name="migrate_to" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_record_pending="true" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -157,7 +157,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="test2_monitor_10000" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="world" CRM_meta_on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0" CRM_meta_start_delay="30000" CRM_meta_timeout="30000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -191,7 +191,7 @@
      <action_set>
       <rsc_op id="9" operation="stop" operation_key="test2_stop_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63">
         <primitive id="test2" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_name="stop" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_timeout="120000" allow_migrate="true"  xmfile="/etc/xen/test2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -206,7 +206,7 @@
   <synapse id="14">
      <action_set>
       <crm_event id="19" 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" />
+        <attributes CRM_meta_on_node="star" CRM_meta_on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="3f368213-61d5-409a-a30e-1428efe70f63"/>
         </downed>
diff --git a/pengine/test10/bug-1822.exp b/pengine/test10/bug-1822.exp
index 974d74d..8ce6d70 100644
--- a/pengine/test10/bug-1822.exp
+++ b/pengine/test10/bug-1822.exp
@@ -60,7 +60,7 @@
      <action_set>
       <rsc_op id="14" operation="stop" operation_key="master_slave_Stateful:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
         <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_timeout="60000"  sleep_time="10000"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_timeout="60000"  sleep_time="10000"/>
       </rsc_op>
      </action_set>
      <inputs>
@@ -76,7 +76,7 @@
      <action_set>
       <rsc_op id="13" operation="demote" operation_key="master_slave_Stateful:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
         <primitive id="master_slave_Stateful:1" class="ocf" provider="heartbeat" type="Dummy-statful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="120000"  sleep_time="10000"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_timeout="120000"  sleep_time="10000"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -89,7 +89,7 @@
      <action_set>
       <rsc_op id="16" operation="stop" operation_key="master_slave_procdctl:1_stop_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
         <primitive id="master_slave_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_timeout="60000"  procd="sleep 10000"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="stop" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_timeout="60000"  procd="sleep 10000"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -105,7 +105,7 @@
      <action_set>
       <rsc_op id="15" operation="demote" operation_key="master_slave_procdctl:1_demote_0" on_node="process1a" on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89">
         <primitive id="master_slave_procdctl:1" class="ocf" provider="heartbeat" type="procdctl"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="120000"  procd="sleep 10000"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_timeout="120000"  procd="sleep 10000"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -167,7 +167,7 @@
    <synapse id="12">
      <action_set>
       <crm_event id="34" 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" />
+        <attributes CRM_meta_on_node="process1a" CRM_meta_on_node_uuid="4dbb8c56-330e-4835-a15e-c0aa632d4e89" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="4dbb8c56-330e-4835-a15e-c0aa632d4e89"/>
         </downed>
diff --git a/pengine/test10/bug-5007-masterslave_colocation.exp b/pengine/test10/bug-5007-masterslave_colocation.exp
index 3c33624..bf83867 100644
--- a/pengine/test10/bug-5007-masterslave_colocation.exp
+++ b/pengine/test10/bug-5007-masterslave_colocation.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="35" operation="start" operation_key="SLAVE_IP_start_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="SLAVE_IP" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="34" operation="stop" operation_key="SLAVE_IP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="SLAVE_IP" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="37" operation="start" operation_key="MASTER_IP_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="MASTER_IP" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -38,7 +38,7 @@
     <action_set>
       <rsc_op id="36" operation="stop" operation_key="MASTER_IP_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="MASTER_IP" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-A-start-B-start.exp b/pengine/test10/bug-5014-A-start-B-start.exp
index 154b23b..c89ed4b 100644
--- a/pengine/test10/bug-5014-A-start-B-start.exp
+++ b/pengine/test10/bug-5014-A-start-B-start.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="ClusterIP_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="4" operation="start" operation_key="ClusterIP_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="ClusterIP_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -38,7 +38,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="ClusterIP2_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -51,7 +51,7 @@
     <action_set>
       <rsc_op id="6" operation="start" operation_key="ClusterIP2_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -67,7 +67,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="ClusterIP2_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-A-stop-B-started.exp b/pengine/test10/bug-5014-A-stop-B-started.exp
index 745ef4b..dc289f0 100644
--- a/pengine/test10/bug-5014-A-stop-B-started.exp
+++ b/pengine/test10/bug-5014-A-stop-B-started.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="ClusterIP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-A-stopped-B-stopped.exp b/pengine/test10/bug-5014-A-stopped-B-stopped.exp
index 4ef72cd..0d3b9ea 100644
--- a/pengine/test10/bug-5014-A-stopped-B-stopped.exp
+++ b/pengine/test10/bug-5014-A-stopped-B-stopped.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="ClusterIP_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="ClusterIP2_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs/>
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 38b1705..1e9013e 100644
--- a/pengine/test10/bug-5014-CLONE-A-start-B-start.exp
+++ b/pengine/test10/bug-5014-CLONE-A-start-B-start.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="ClusterIP:0_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" long-id="ClusterIP:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="4" operation="start" operation_key="ClusterIP:0_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" long-id="ClusterIP:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="ClusterIP:0_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" long-id="ClusterIP:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -65,7 +65,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="ClusterIP2:0_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" long-id="ClusterIP2:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -78,7 +78,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="ClusterIP2:0_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" long-id="ClusterIP2:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -91,7 +91,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="ClusterIP2:0_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" long-id="ClusterIP2:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp b/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp
index 5da5b83..aa99923 100644
--- a/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp
+++ b/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="ClusterIP:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" long-id="ClusterIP:0" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
index 9e9265f..0896ce2 100644
--- a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
+++ b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="ClusterIP_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="ClusterIP2_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="ClusterIP3_monitor_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP3" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.103"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.103"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-GROUP-A-start-B-start.exp b/pengine/test10/bug-5014-GROUP-A-start-B-start.exp
index 407f04b..598bdce 100644
--- a/pengine/test10/bug-5014-GROUP-A-start-B-start.exp
+++ b/pengine/test10/bug-5014-GROUP-A-start-B-start.exp
@@ -26,7 +26,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="ClusterIP_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="2" operation="start" operation_key="ClusterIP_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -79,7 +79,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="ClusterIP2_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -92,7 +92,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="ClusterIP2_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP2" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.102"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp
index 06749e9..0a0cb5c 100644
--- a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp
+++ b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp
@@ -26,7 +26,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="ClusterIP_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="ClusterIP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" cidr_netmask="32"  ip="192.168.122.101"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp b/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp
index 445a77c..4525661 100644
--- a/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp
+++ b/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="C_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="C" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp b/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp
index e6fe6d0..d0c9593 100644
--- a/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp
+++ b/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="stop" operation_key="A_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="C_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="C" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5025-1.exp b/pengine/test10/bug-5025-1.exp
index 8465dfb..053ece4 100644
--- a/pengine/test10/bug-5025-1.exp
+++ b/pengine/test10/bug-5025-1.exp
@@ -3,7 +3,7 @@
     <action_set>
       <crm_event id="4" operation="clear_failcount" operation_key="A_clear_failcount_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" allow-migrate="1" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" allow-migrate="1" />
       </crm_event>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="3" operation="reload" operation_key="A_reload_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" allow-migrate="1" />
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" allow-migrate="1" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="1" operation="monitor" operation_key="A_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="60000" allow-migrate="1" />
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="60000" allow-migrate="1" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5025-3.exp b/pengine/test10/bug-5025-3.exp
index 3b01eae..eb2e2e6 100644
--- a/pengine/test10/bug-5025-3.exp
+++ b/pengine/test10/bug-5025-3.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="A_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <crm_event id="4" operation="clear_failcount" operation_key="A_clear_failcount_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
       </crm_event>
     </action_set>
     <inputs/>
@@ -21,7 +21,7 @@
     <action_set>
       <rsc_op id="3" operation="start" operation_key="A_start_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
+        <attributes CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="20000" allow-migrate="1"  state="anywhere" target-role="started"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -34,7 +34,7 @@
     <action_set>
       <rsc_op id="1" operation="monitor" operation_key="A_monitor_30000" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="60000" allow-migrate="1"  state="anywhere" target-role="started"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="fc16-builder" CRM_meta_on_node_uuid="fc16-builder" CRM_meta_timeout="60000" allow-migrate="1"  state="anywhere" target-role="started"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5025-4.exp b/pengine/test10/bug-5025-4.exp
index 16d9fc1..a51c888 100644
--- a/pengine/test10/bug-5025-4.exp
+++ b/pengine/test10/bug-5025-4.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="remote-node_monitor_30000" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="4" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000"  port="1984" server="18node1"/>
+        <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="3" operation="delete" operation_key="remote-node_delete_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000"  port="1984" server="18node1"/>
+        <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -38,7 +38,7 @@
     <action_set>
       <crm_event id="1" operation="clear_failcount" operation_key="remote-node_clear_failcount" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
+        <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </crm_event>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5028-bottom.exp b/pengine/test10/bug-5028-bottom.exp
index 2853f2d..f7e7050 100644
--- a/pengine/test10/bug-5028-bottom.exp
+++ b/pengine/test10/bug-5028-bottom.exp
@@ -11,7 +11,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="dummy02_stop_0" on_node="bl460g6a" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="dummy02" class="ocf" provider="heartbeat" type="Dummy-stop-NG"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="bl460g6a" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5028-detach.exp b/pengine/test10/bug-5028-detach.exp
index 3f7cdaf..8c3cae3 100644
--- a/pengine/test10/bug-5028-detach.exp
+++ b/pengine/test10/bug-5028-detach.exp
@@ -2,7 +2,7 @@
   <synapse id="0">
     <action_set>
       <crm_event id="11" 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" />
+        <attributes CRM_meta_on_node="bl460g6a" CRM_meta_on_node_uuid="11111111-1111-1111-1111-111111111111" CRM_meta_op_no_wait="true" />
         <downed>
           <node id="11111111-1111-1111-1111-111111111111"/>
         </downed>
diff --git a/pengine/test10/bug-5059.exp b/pengine/test10/bug-5059.exp
index 3f1fe64..b4a2e07 100644
--- a/pengine/test10/bug-5059.exp
+++ b/pengine/test10/bug-5059.exp
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="95" operation="notify" operation_key="p_stateful1:0_post_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -70,7 +70,7 @@
     <action_set>
       <rsc_op id="94" operation="notify" operation_key="p_stateful1:0_pre_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -83,7 +83,7 @@
     <action_set>
       <rsc_op id="85" operation="notify" operation_key="p_stateful1:0_post_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <rsc_op id="84" operation="notify" operation_key="p_stateful1:0_pre_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -109,7 +109,7 @@
     <action_set>
       <rsc_op id="8" operation="promote" operation_key="p_stateful1:0_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="97" operation="notify" operation_key="p_stateful2:0_post_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -135,7 +135,7 @@
     <action_set>
       <rsc_op id="96" operation="notify" operation_key="p_stateful2:0_pre_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -148,7 +148,7 @@
     <action_set>
       <rsc_op id="86" operation="notify" operation_key="p_stateful2:0_post_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -161,7 +161,7 @@
     <action_set>
       <rsc_op id="10" operation="promote" operation_key="p_stateful2:0_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -180,7 +180,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="p_stateful2:0_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="gluster01.h" CRM_meta_on_node_uuid="gluster01.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -220,7 +220,7 @@
     <action_set>
       <rsc_op id="99" operation="notify" operation_key="p_stateful1:1_post_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -233,7 +233,7 @@
     <action_set>
       <rsc_op id="98" operation="notify" operation_key="p_stateful1:1_pre_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -246,7 +246,7 @@
     <action_set>
       <rsc_op id="88" operation="notify" operation_key="p_stateful1:1_post_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -259,7 +259,7 @@
     <action_set>
       <rsc_op id="87" operation="notify" operation_key="p_stateful1:1_pre_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -272,7 +272,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="p_stateful1:1_monitor_10000" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1: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="true" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -288,7 +288,7 @@
     <action_set>
       <rsc_op id="101" operation="notify" operation_key="p_stateful2:1_post_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -301,7 +301,7 @@
     <action_set>
       <rsc_op id="100" operation="notify" operation_key="p_stateful2:1_pre_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -314,7 +314,7 @@
     <action_set>
       <rsc_op id="89" operation="notify" operation_key="p_stateful2:1_post_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -327,7 +327,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="p_stateful2:1_monitor_10000" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -346,7 +346,7 @@
     <action_set>
       <rsc_op id="22" operation="start" operation_key="p_stateful2:1_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2: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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -556,7 +556,7 @@
     <action_set>
       <rsc_op id="4" operation="delete" operation_key="iptest_delete_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="iptest" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -565,7 +565,7 @@
     <action_set>
       <rsc_op id="5" operation="delete" operation_key="ipsrc2_delete_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="ipsrc2" class="ocf" provider="heartbeat" type="IPsrcaddr"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="gluster02.h" CRM_meta_on_node_uuid="gluster02.h" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5069-op-disabled.exp b/pengine/test10/bug-5069-op-disabled.exp
index ca7f56c..9653af1 100644
--- a/pengine/test10/bug-5069-op-disabled.exp
+++ b/pengine/test10/bug-5069-op-disabled.exp
@@ -3,7 +3,7 @@
     <action_set>
       <crm_event id="3" operation="clear_failcount" operation_key="A_clear_failcount_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="1" operation="cancel" operation_key="A_monitor_10000" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_call_id="4" CRM_meta_enabled="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="ignore" CRM_meta_operation="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_call_id="4" CRM_meta_enabled="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="ignore" CRM_meta_on_node="fc16-builder2" CRM_meta_on_node_uuid="fc16-builder2" CRM_meta_operation="monitor" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-5140-require-all-false.exp b/pengine/test10/bug-5140-require-all-false.exp
index bce90d0..9751b9b 100644
--- a/pengine/test10/bug-5140-require-all-false.exp
+++ b/pengine/test10/bug-5140-require-all-false.exp
@@ -36,7 +36,7 @@
     <action_set>
       <rsc_op id="2" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="dlm" long-id="dlm:0" class="ocf" provider="pacemaker" type="controld"/>
-        <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_record_pending="true" CRM_meta_timeout="120000" />
+        <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_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -52,7 +52,7 @@
     <action_set>
       <rsc_op id="3" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="clvmd" long-id="clvmd:0" class="ocf" provider="lvm2" type="clvmd"/>
-        <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_record_pending="true" CRM_meta_timeout="120000" />
+        <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_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="o2cb_stop_0" internal_operation_key="o2cb:0_stop_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="o2cb" long-id="o2cb:0" class="ocf" provider="ocfs2" type="o2cb"/>
-        <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_record_pending="true" CRM_meta_timeout="120000" />
+        <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_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5143-ms-shuffle.exp b/pengine/test10/bug-5143-ms-shuffle.exp
index 5fffd20..c591421 100644
--- a/pengine/test10/bug-5143-ms-shuffle.exp
+++ b/pengine/test10/bug-5143-ms-shuffle.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="184" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="183" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="98" operation="monitor" operation_key="drbd-r1_monitor_29000" internal_operation_key="drbd-r1:0_monitor_29000" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="29000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_record_pending="true" CRM_meta_role="Slave" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="29000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_role="Slave" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="102" operation="monitor" operation_key="drbd-r1_monitor_31000" internal_operation_key="drbd-r1:1_monitor_31000" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="31000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_record_pending="true" CRM_meta_role="Master" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="31000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_op_target_rc="8" CRM_meta_record_pending="true" CRM_meta_role="Master" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="101" operation="promote" operation_key="drbd-r1_promote_0" internal_operation_key="drbd-r1:1_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5186-partial-migrate.exp b/pengine/test10/bug-5186-partial-migrate.exp
index eddabe1..bba083e 100644
--- a/pengine/test10/bug-5186-partial-migrate.exp
+++ b/pengine/test10/bug-5186-partial-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="14" operation="start" operation_key="prmDummy_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmDummy" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -31,7 +31,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="prmVM2_monitor_10000" on_node="bl460g1n8" on_node_uuid="3232261594">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="30000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n8" CRM_meta_on_node_uuid="3232261594" CRM_meta_record_pending="true" CRM_meta_timeout="30000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -44,7 +44,7 @@
     <action_set>
       <rsc_op id="16" operation="start" operation_key="prmVM2_start_0" on_node="bl460g1n8" on_node_uuid="3232261594">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n8" CRM_meta_on_node_uuid="3232261594" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -75,7 +75,7 @@
     <action_set>
       <rsc_op id="1" operation="stop" operation_key="prmVM2_stop_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmVM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="120000" config="/migrate_test/config/vm2.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -140,7 +140,7 @@
     <action_set>
       <rsc_op id="36" operation="monitor" operation_key="prmStonith8-1_monitor_10000" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -153,7 +153,7 @@
     <action_set>
       <rsc_op id="35" operation="start" operation_key="prmStonith8-1_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-1" class="stonith" type="external/stonith-helper"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  dead_check_target="192.168.133.218 192.168.101.218 192.168.102.218 192.168.201.218 192.168.133.238" hostlist="bl460g1n8" pcmk_reboot_retries="1" pcmk_reboot_timeout="40s" run_standby_wait="no"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -184,7 +184,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="prmStonith8-2_monitor_3600000" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -197,7 +197,7 @@
     <action_set>
       <rsc_op id="38" operation="start" operation_key="prmStonith8-2_start_0" on_node="bl460g1n6" on_node_uuid="3232261592">
         <primitive id="prmStonith8-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g1n6" CRM_meta_on_node_uuid="3232261592" CRM_meta_record_pending="true" CRM_meta_timeout="60000"  hostname="bl460g1n8" interface="lanplus" ipaddr="192.168.133.238" passwd="PASSW0RD" pcmk_reboot_retries="1" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5168.exp b/pengine/test10/bug-cl-5168.exp
index 82089f9..0b6617e 100644
--- a/pengine/test10/bug-cl-5168.exp
+++ b/pengine/test10/bug-cl-5168.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="126" operation="monitor" operation_key="drbd-r1_monitor_29000" internal_operation_key="drbd-r1:0_monitor_29000" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="29000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_record_pending="true" CRM_meta_role="Slave" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="29000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="hex-2" CRM_meta_on_node_uuid="hex-2" CRM_meta_record_pending="true" CRM_meta_role="Slave" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="188" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="187" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="130" operation="monitor" operation_key="drbd-r1_monitor_31000" internal_operation_key="drbd-r1:1_monitor_31000" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="31000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_record_pending="true" CRM_meta_role="Master" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="31000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_op_target_rc="8" CRM_meta_record_pending="true" CRM_meta_role="Master" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="129" operation="promote" operation_key="drbd-r1_promote_0" internal_operation_key="drbd-r1:1_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="hex-3" CRM_meta_on_node_uuid="hex-3" CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5170.exp b/pengine/test10/bug-cl-5170.exp
index c6b8720..d8143c0 100644
--- a/pengine/test10/bug-cl-5170.exp
+++ b/pengine/test10/bug-cl-5170.exp
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="ip_trf_stop_0" on_node="TCS-2" on_node_uuid="TCS-2">
         <primitive id="ip_trf" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" broadcast="172.18.19.51"  iflabel="ha" ip="172.18.19.51" nic="bond0.3019"/>
+        <attributes CRM_meta_on_node="TCS-2" CRM_meta_on_node_uuid="TCS-2" CRM_meta_timeout="20000" broadcast="172.18.19.51"  iflabel="ha" ip="172.18.19.51" nic="bond0.3019"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -45,7 +45,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="ip_mgmt_stop_0" on_node="TCS-2" on_node_uuid="TCS-2">
         <primitive id="ip_mgmt" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" broadcast="172.20.1.51"  iflabel="ha" ip="172.20.1.51" nic="bond0"/>
+        <attributes CRM_meta_on_node="TCS-2" CRM_meta_on_node_uuid="TCS-2" CRM_meta_timeout="20000" broadcast="172.20.1.51"  iflabel="ha" ip="172.20.1.51" nic="bond0"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp
index 080ba5a..1c35061 100644
--- a/pengine/test10/bug-cl-5212.exp
+++ b/pengine/test10/bug-cl-5212.exp
@@ -43,7 +43,7 @@
     <action_set>
       <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -56,7 +56,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="3232238300" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5213.exp b/pengine/test10/bug-cl-5213.exp
index 154384d..790b12a 100644
--- a/pengine/test10/bug-cl-5213.exp
+++ b/pengine/test10/bug-cl-5213.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="pgsql_monitor_10000" internal_operation_key="pgsql:1_monitor_10000" on_node="srv01" on_node_uuid="3232238180">
         <primitive id="pgsql" long-id="pgsql: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="true" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <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="true" CRM_meta_on_fail="restart" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="3232238180" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-cl-5219.exp b/pengine/test10/bug-cl-5219.exp
index 182b279..608c849 100644
--- a/pengine/test10/bug-cl-5219.exp
+++ b/pengine/test10/bug-cl-5219.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="stop" operation_key="child1-service_stop_0" on_node="ha2.test.anchor.net.au" on_node_uuid="3232235522">
         <primitive id="child1-service" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="ha2.test.anchor.net.au" CRM_meta_on_node_uuid="3232235522" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp
index 521c124..ae3ad11 100644
--- a/pengine/test10/bug-cl-5247.exp
+++ b/pengine/test10/bug-cl-5247.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="prmDB2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="prmDB2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_remote_node="pgsr02" CRM_meta_timeout="120000" config="/etc/libvirt/qemu/pgsr02.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="fence" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_remote_node="pgsr02" CRM_meta_timeout="120000" config="/etc/libvirt/qemu/pgsr02.xml"  hypervisor="qemu:///system" migration_transport="ssh"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -66,7 +66,7 @@
     <action_set>
       <rsc_op id="13" operation="stop" operation_key="prmStonith1-2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -79,7 +79,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="prmStonith1-2_start_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -98,7 +98,7 @@
     <action_set>
       <rsc_op id="1" operation="monitor" operation_key="prmStonith1-2_monitor_3600000" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="prmStonith1-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="60000"  hostname="bl460g8n3" interface="lanplus" ipaddr="192.168.28.43" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -161,7 +161,7 @@
     <action_set>
       <rsc_op id="18" operation="stop" operation_key="prmStonith2-2_stop_0" on_node="bl460g8n3" on_node_uuid="3232261399">
         <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="ignore" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -174,7 +174,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="prmStonith2-2_start_0" on_node="bl460g8n3" on_node_uuid="3232261399">
         <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -193,7 +193,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="prmStonith2-2_monitor_3600000" on_node="bl460g8n3" on_node_uuid="3232261399">
         <primitive id="prmStonith2-2" class="stonith" type="external/ipmi"/>
-        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
+        <attributes CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="bl460g8n3" CRM_meta_on_node_uuid="3232261399" CRM_meta_timeout="60000"  hostname="bl460g8n4" interface="lanplus" ipaddr="192.168.28.44" passwd="****" pcmk_reboot_timeout="60s" userid="USERID"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -269,7 +269,7 @@
     <action_set>
       <rsc_op id="25" operation="monitor" operation_key="vip-master_monitor_10000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-master" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -282,7 +282,7 @@
     <action_set>
       <rsc_op id="24" operation="start" operation_key="vip-master_start_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-master" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -319,7 +319,7 @@
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="vip-rep_monitor_10000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-rep" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -332,7 +332,7 @@
     <action_set>
       <rsc_op id="27" operation="start" operation_key="vip-rep_start_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="vip-rep" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="stop" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="stop" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -429,7 +429,7 @@
     <action_set>
       <rsc_op id="81" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -442,7 +442,7 @@
     <action_set>
       <rsc_op id="80" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -455,7 +455,7 @@
     <action_set>
       <rsc_op id="77" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -468,7 +468,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:1_post_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" 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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stonith" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -484,7 +484,7 @@
     <action_set>
       <rsc_op id="39" operation="monitor" operation_key="pgsql_monitor_9000" internal_operation_key="pgsql:1_monitor_9000" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" 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="9000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_fail="restart" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="9000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_fail="restart" CRM_meta_on_node="pgsr01" CRM_meta_on_node_uuid="pgsr01" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -673,7 +673,7 @@
     <action_set>
       <rsc_op id="66" operation="stop" operation_key="pgsr02_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400">
         <primitive id="pgsr02" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="prmDB2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_container="prmDB2" CRM_meta_on_node="bl460g8n4" CRM_meta_on_node_uuid="3232261400" CRM_meta_timeout="20000" />
         <downed>
           <node id="pgsr02"/>
         </downed>
diff --git a/pengine/test10/bug-lf-1852.exp b/pengine/test10/bug-lf-1852.exp
index f5a2fef..2b79617 100644
--- a/pengine/test10/bug-lf-1852.exp
+++ b/pengine/test10/bug-lf-1852.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="48" operation="notify" operation_key="drbd0:0_post_notify_start_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="mysql-02" CRM_meta_on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="47" operation="notify" operation_key="drbd0:0_pre_notify_start_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="mysql-02" CRM_meta_on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="49" operation="notify" operation_key="drbd0:1_post_notify_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="mysql-01" CRM_meta_on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="6" operation="start" operation_key="drbd0:1_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="mysql-01" CRM_meta_on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-lf-1920.exp b/pengine/test10/bug-lf-1920.exp
index da2d03c..27965ed 100644
--- a/pengine/test10/bug-lf-1920.exp
+++ b/pengine/test10/bug-lf-1920.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="mysql-bin_monitor_30000" on_node="dktest2sles10" on_node_uuid="1db2544e-c39c-442c-be34-016c812fcf66">
         <primitive id="mysql-bin" class="ocf" provider="heartbeat" type="mysql"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" binary="/packages/10.0/mysql/bin/mysqld_safe" config="/packages/10.0/mysql/my.cnf"  datadir="/packages/10.0/mysql/var" logfile="/packages/10.0/mysql/var/mysqld.log" socket="/packages/10.0/mysql/var/mysql.sock"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="dktest2sles10" CRM_meta_on_node_uuid="1db2544e-c39c-442c-be34-016c812fcf66" CRM_meta_timeout="20000" binary="/packages/10.0/mysql/bin/mysqld_safe" config="/packages/10.0/mysql/my.cnf"  datadir="/packages/10.0/mysql/var" logfile="/packages/10.0/mysql/var/mysqld.log" socket="/packages/10.0/mysql/var/mysql.sock"/>
        </rsc_op>
      </action_set>
      <inputs/>
diff --git a/pengine/test10/bug-lf-2106.exp b/pengine/test10/bug-lf-2106.exp
index fc89c3f..f7d4900 100644
--- a/pengine/test10/bug-lf-2106.exp
+++ b/pengine/test10/bug-lf-2106.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="29" operation="stop" operation_key="pingd:0_stop_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <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"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <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_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="25" operation="start" operation_key="pingd:0_start_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <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"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <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_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -32,7 +32,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="pingd:0_monitor_30000" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -45,7 +45,7 @@
     <action_set>
       <crm_event id="2" operation="clear_failcount" operation_key="pingd:0_clear_failcount" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <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_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <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_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </crm_event>
     </action_set>
     <inputs/>
@@ -54,7 +54,7 @@
     <action_set>
       <rsc_op id="30" operation="stop" operation_key="pingd:0_stop_0" internal_operation_key="pingd:1_stop_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -67,7 +67,7 @@
     <action_set>
       <rsc_op id="26" operation="start" operation_key="pingd:0_start_0" internal_operation_key="pingd:1_start_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -83,7 +83,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="pingd:0_monitor_30000" internal_operation_key="pingd:1_monitor_30000" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <crm_event id="10" operation="clear_failcount" operation_key="pingd:0_clear_failcount_0" internal_operation_key="pingd:1_clear_failcount" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </crm_event>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2153.exp b/pengine/test10/bug-lf-2153.exp
index f222477..54f211f 100644
--- a/pengine/test10/bug-lf-2153.exp
+++ b/pengine/test10/bug-lf-2153.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_on_node="bob" CRM_meta_on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="res_drbd_iscsivg01:0_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_on_node="bob" CRM_meta_on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="post" CRM_meta_on_node="alice" CRM_meta_on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="70" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_on_node="alice" CRM_meta_on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -138,7 +138,7 @@
     <action_set>
       <rsc_op id="38" operation="stop" operation_key="res_tgtd:0_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
         <primitive id="res_tgtd" long-id="res_tgtd:0" class="lsb" type="tgtd"/>
-        <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" />
+        <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_on_node="bob" CRM_meta_on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2160.exp b/pengine/test10/bug-lf-2160.exp
index 61fd792..1a69082 100644
--- a/pengine/test10/bug-lf-2160.exp
+++ b/pengine/test10/bug-lf-2160.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="domU-test01_monitor_0" on_node="cardhu" on_node_uuid="cardhu">
         <primitive id="domU-test01" class="ocf" provider="heartbeat" type="Xen"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test01.cfg"/>
+        <attributes CRM_meta_on_node="cardhu" CRM_meta_on_node_uuid="cardhu" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" allow_migrate="true"  xmfile="/etc/xen/test01.cfg"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="dom0-iscsi1-cnx1:0_monitor_0" on_node="cardhu" on_node_uuid="cardhu">
         <primitive id="dom0-iscsi1-cnx1" long-id="dom0-iscsi1-cnx1:0" class="ocf" provider="heartbeat" type="iscsi"/>
-        <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"  portal="10.151.1.72" target="iqn.2009-03.fr.u-picardie.testfrontal-01:test01"/>
+        <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_on_node="cardhu" CRM_meta_on_node_uuid="cardhu" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  portal="10.151.1.72" target="iqn.2009-03.fr.u-picardie.testfrontal-01:test01"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2171.exp b/pengine/test10/bug-lf-2171.exp
index c6c3379..8679088 100644
--- a/pengine/test10/bug-lf-2171.exp
+++ b/pengine/test10/bug-lf-2171.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="res_Dummy1:1_stop_0" internal_operation_key="res_Dummy1:0_stop_0" on_node="xenserver1" on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64">
         <primitive id="res_Dummy1" long-id="res_Dummy1:1" 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_record_pending="true" CRM_meta_timeout="20000" />
+        <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_on_node="xenserver1" CRM_meta_on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="stop" operation_key="res_Dummy1:0_stop_0" internal_operation_key="res_Dummy1:1_stop_0" on_node="xenserver2" on_node_uuid="ab2e800a-4e31-42e9-9e33-f6ca81a3e9e6">
         <primitive id="res_Dummy1" long-id="res_Dummy1:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="xenserver2" CRM_meta_on_node_uuid="ab2e800a-4e31-42e9-9e33-f6ca81a3e9e6" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -85,7 +85,7 @@
     <action_set>
       <rsc_op id="12" operation="stop" operation_key="res_Dummy2_stop_0" on_node="xenserver1" on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64">
         <primitive id="res_Dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="xenserver1" CRM_meta_on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -98,7 +98,7 @@
     <action_set>
       <rsc_op id="14" operation="stop" operation_key="res_Dummy3_stop_0" on_node="xenserver1" on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64">
         <primitive id="res_Dummy3" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="xenserver1" CRM_meta_on_node_uuid="56cfdd8b-b7ce-4420-b0b0-2e9ec84a9b64" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2213.exp b/pengine/test10/bug-lf-2213.exp
index c2f7052..5a6a311 100644
--- a/pengine/test10/bug-lf-2213.exp
+++ b/pengine/test10/bug-lf-2213.exp
@@ -30,7 +30,7 @@
     <action_set>
       <rsc_op id="2" operation="start" operation_key="test:0_start_0" on_node="web1" on_node_uuid="web1">
         <primitive id="test" long-id="test:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  device="192.168.55.15:/srv/nfs/web/" directory="/srv/web/" fstype="nfs" options="hard,intr,noatime,rw,nolock,tcp,timeo=50"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="web1" CRM_meta_on_node_uuid="web1" CRM_meta_timeout="20000"  device="192.168.55.15:/srv/nfs/web/" directory="/srv/web/" fstype="nfs" options="hard,intr,noatime,rw,nolock,tcp,timeo=50"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -70,7 +70,7 @@
     <action_set>
       <rsc_op id="7" operation="start" operation_key="test:1_start_0" on_node="web2" on_node_uuid="web2">
         <primitive id="test" long-id="test:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  device="192.168.55.15:/srv/nfs/web/" directory="/srv/web/" fstype="nfs" options="hard,intr,noatime,rw,nolock,tcp,timeo=50"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="web2" CRM_meta_on_node_uuid="web2" CRM_meta_timeout="20000"  device="192.168.55.15:/srv/nfs/web/" directory="/srv/web/" fstype="nfs" options="hard,intr,noatime,rw,nolock,tcp,timeo=50"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp
index 3059408..ecf808d 100644
--- a/pengine/test10/bug-lf-2317.exp
+++ b/pengine/test10/bug-lf-2317.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="49" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
         <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="ibm2.isg.si" CRM_meta_on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="48" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
         <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="ibm2.isg.si" CRM_meta_on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="50" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="drbd_r0:0_monitor_15000" internal_operation_key="drbd_r0:1_monitor_15000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="30000"  drbd_resource="r0"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="30000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="13" operation="promote" operation_key="drbd_r0:0_promote_0" internal_operation_key="drbd_r0:1_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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="2" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_r0:0" CRM_meta_notify_master_uname="ibm2.isg.si" CRM_meta_notify_promote_resource="drbd_r0:1" CRM_meta_notify_promote_uname="ibm1.isg.si" CRM_meta_notify_slave_resource="drbd_r0:1" CRM_meta_notify_slave_uname="ibm1.isg.si" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -87,7 +87,7 @@
     <action_set>
       <rsc_op id="3" operation="cancel" operation_key="drbd_r0:0_monitor_30000" internal_operation_key="drbd_r0:1_monitor_30000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="30000"  drbd_resource="r0"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_on_node="ibm1.isg.si" CRM_meta_on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="30000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2358.exp b/pengine/test10/bug-lf-2358.exp
index 2abb622..437ffec 100644
--- a/pengine/test10/bug-lf-2358.exp
+++ b/pengine/test10/bug-lf-2358.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="129" operation="notify" operation_key="res_drbd_mysql1:0_post_notify_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="128" operation="notify" operation_key="res_drbd_mysql1:0_pre_notify_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:0" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="130" operation="notify" operation_key="res_drbd_mysql1:1_post_notify_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="50" operation="start" operation_key="res_drbd_mysql1:1_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:1" class="ocf" provider="linbit" type="drbd"/>
-        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2361.exp b/pengine/test10/bug-lf-2361.exp
index ccae9c2..dd909bd 100644
--- a/pengine/test10/bug-lf-2361.exp
+++ b/pengine/test10/bug-lf-2361.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="45" operation="notify" operation_key="stateful:0_post_notify_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="stateful" long-id="stateful:0" class="ocf" provider="heartbeat" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="start" operation_key="stateful:0_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="stateful" long-id="stateful:0" class="ocf" provider="heartbeat" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="46" operation="notify" operation_key="stateful:1_post_notify_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="stateful" long-id="stateful:1" class="ocf" provider="heartbeat" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="stateful:1_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="stateful" long-id="stateful:1" class="ocf" provider="heartbeat" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful:0 stateful:1" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="stateful:0 stateful:1" CRM_meta_notify_start_uname="alice.demo bob.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -138,7 +138,7 @@
     <action_set>
       <rsc_op id="5" operation="delete" operation_key="service2:0_delete_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="service2:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -147,7 +147,7 @@
     <action_set>
       <rsc_op id="2" operation="delete" operation_key="service2:0_delete_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="service2:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -156,7 +156,7 @@
     <action_set>
       <rsc_op id="3" operation="delete" operation_key="service2:1_delete_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="service2:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -165,7 +165,7 @@
     <action_set>
       <rsc_op id="6" operation="delete" operation_key="service1_delete_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="service1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -174,7 +174,7 @@
     <action_set>
       <rsc_op id="4" operation="delete" operation_key="service1_delete_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="service1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2422.exp b/pengine/test10/bug-lf-2422.exp
index 724cb23..14eba30 100644
--- a/pengine/test10/bug-lf-2422.exp
+++ b/pengine/test10/bug-lf-2422.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="sbd_stonith_monitor_15000" on_node="qa-suse-2" on_node_uuid="qa-suse-2">
         <primitive id="sbd_stonith" class="stonith" type="external/sbd"/>
-        <attributes CRM_meta_interval="15000" CRM_meta_name="monitor" CRM_meta_start_delay="15000" CRM_meta_timeout="15000"  sbd_device="/dev/sda1"/>
+        <attributes CRM_meta_interval="15000" CRM_meta_name="monitor" CRM_meta_on_node="qa-suse-2" CRM_meta_on_node_uuid="qa-suse-2" CRM_meta_start_delay="15000" CRM_meta_timeout="15000"  sbd_device="/dev/sda1"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -45,7 +45,7 @@
     <action_set>
       <rsc_op id="13" operation="stop" operation_key="o2cb:1_stop_0" internal_operation_key="o2cb:0_stop_0" on_node="qa-suse-1" on_node_uuid="qa-suse-1">
         <primitive id="o2cb" long-id="o2cb:1" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-1" CRM_meta_on_node_uuid="qa-suse-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -61,7 +61,7 @@
     <action_set>
       <rsc_op id="14" operation="stop" operation_key="cmirror:1_stop_0" internal_operation_key="cmirror:0_stop_0" on_node="qa-suse-1" on_node_uuid="qa-suse-1">
         <primitive id="cmirror" long-id="cmirror:1" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-1" CRM_meta_on_node_uuid="qa-suse-1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -107,7 +107,7 @@
     <action_set>
       <rsc_op id="23" operation="stop" operation_key="o2cb:0_stop_0" internal_operation_key="o2cb:1_stop_0" on_node="qa-suse-4" on_node_uuid="qa-suse-4">
         <primitive id="o2cb" long-id="o2cb:0" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-4" CRM_meta_on_node_uuid="qa-suse-4" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -123,7 +123,7 @@
     <action_set>
       <rsc_op id="24" operation="stop" operation_key="cmirror:0_stop_0" internal_operation_key="cmirror:1_stop_0" on_node="qa-suse-4" on_node_uuid="qa-suse-4">
         <primitive id="cmirror" long-id="cmirror:0" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-4" CRM_meta_on_node_uuid="qa-suse-4" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -169,7 +169,7 @@
     <action_set>
       <rsc_op id="33" operation="stop" operation_key="o2cb:2_stop_0" on_node="qa-suse-3" on_node_uuid="qa-suse-3">
         <primitive id="o2cb" long-id="o2cb:2" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-3" CRM_meta_on_node_uuid="qa-suse-3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -185,7 +185,7 @@
     <action_set>
       <rsc_op id="34" operation="stop" operation_key="cmirror:2_stop_0" on_node="qa-suse-3" on_node_uuid="qa-suse-3">
         <primitive id="cmirror" long-id="cmirror:2" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-3" CRM_meta_on_node_uuid="qa-suse-3" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -231,7 +231,7 @@
     <action_set>
       <rsc_op id="43" operation="stop" operation_key="o2cb:3_stop_0" on_node="qa-suse-2" on_node_uuid="qa-suse-2">
         <primitive id="o2cb" long-id="o2cb:3" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-2" CRM_meta_on_node_uuid="qa-suse-2" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -247,7 +247,7 @@
     <action_set>
       <rsc_op id="44" operation="stop" operation_key="cmirror:3_stop_0" on_node="qa-suse-2" on_node_uuid="qa-suse-2">
         <primitive id="cmirror" long-id="cmirror:3" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-2" CRM_meta_on_node_uuid="qa-suse-2" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -296,7 +296,7 @@
     <action_set>
       <rsc_op id="53" operation="stop" operation_key="ocfs:1_stop_0" internal_operation_key="ocfs:0_stop_0" on_node="qa-suse-1" on_node_uuid="qa-suse-1">
         <primitive id="ocfs" long-id="ocfs:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-1" CRM_meta_on_node_uuid="qa-suse-1" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -312,7 +312,7 @@
     <action_set>
       <rsc_op id="54" operation="stop" operation_key="ocfs:0_stop_0" internal_operation_key="ocfs:1_stop_0" on_node="qa-suse-4" on_node_uuid="qa-suse-4">
         <primitive id="ocfs" long-id="ocfs:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-4" CRM_meta_on_node_uuid="qa-suse-4" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -328,7 +328,7 @@
     <action_set>
       <rsc_op id="55" operation="stop" operation_key="ocfs:2_stop_0" on_node="qa-suse-3" on_node_uuid="qa-suse-3">
         <primitive id="ocfs" long-id="ocfs:2" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-3" CRM_meta_on_node_uuid="qa-suse-3" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -344,7 +344,7 @@
     <action_set>
       <rsc_op id="56" operation="stop" operation_key="ocfs:3_stop_0" on_node="qa-suse-2" on_node_uuid="qa-suse-2">
         <primitive id="ocfs" long-id="ocfs:3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
+        <attributes CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="qa-suse-2" CRM_meta_on_node_uuid="qa-suse-2" CRM_meta_timeout="60000"  device="/dev/sdb1" directory="/ocfs2" fstype="ocfs2"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp
index 22fda7a..4349312 100644
--- a/pengine/test10/bug-lf-2435.exp
+++ b/pengine/test10/bug-lf-2435.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="dummy2_start_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c21.chepkov.lan" CRM_meta_on_node_uuid="c21.chepkov.lan" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="7" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
         <primitive id="dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c20.chepkov.lan" CRM_meta_on_node_uuid="c20.chepkov.lan" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="dummy4_monitor_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c21.chepkov.lan" CRM_meta_on_node_uuid="c21.chepkov.lan" CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -37,7 +37,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="dummy4_monitor_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c20.chepkov.lan" CRM_meta_on_node_uuid="c20.chepkov.lan" CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -46,7 +46,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="dummy4_monitor_0" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan">
         <primitive id="dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c19.chepkov.lan" CRM_meta_on_node_uuid="c19.chepkov.lan" CRM_meta_op_target_rc="7" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="dummy3_stop_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan">
         <primitive id="dummy3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="120000" />
+        <attributes CRM_meta_on_node="c21.chepkov.lan" CRM_meta_on_node_uuid="c21.chepkov.lan" CRM_meta_timeout="120000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2445.exp b/pengine/test10/bug-lf-2445.exp
index 5f89edb..953b32d 100644
--- a/pengine/test10/bug-lf-2445.exp
+++ b/pengine/test10/bug-lf-2445.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="5" operation="start" operation_key="P:1_start_0" on_node="node2" on_node_uuid="node2">
         <primitive id="P:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="P:1_stop_0" on_node="node1" on_node_uuid="node1">
         <primitive id="P:1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="2" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2453.exp b/pengine/test10/bug-lf-2453.exp
index 2aabeab..c4dd2b2 100644
--- a/pengine/test10/bug-lf-2453.exp
+++ b/pengine/test10/bug-lf-2453.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="7" operation="stop" operation_key="PrimitiveResource1_stop_0" on_node="domu1" on_node_uuid="domu1">
         <primitive id="PrimitiveResource1" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.1.50"/>
+        <attributes CRM_meta_on_node="domu1" CRM_meta_on_node_uuid="domu1" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.1.50"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="apache:1_stop_0" internal_operation_key="apache:0_stop_0" on_node="domu1" on_node_uuid="domu1">
         <primitive id="apache" long-id="apache:1" class="ocf" provider="heartbeat" type="apache"/>
-        <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" configfile="/etc/apache2/httpd.conf" />
+        <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_on_node="domu1" CRM_meta_on_node_uuid="domu1" CRM_meta_timeout="20000" configfile="/etc/apache2/httpd.conf" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="10" operation="stop" operation_key="apache:0_stop_0" internal_operation_key="apache:1_stop_0" on_node="domu2" on_node_uuid="domu2">
         <primitive id="apache" long-id="apache:0" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" configfile="/etc/apache2/httpd.conf" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="domu2" CRM_meta_on_node_uuid="domu2" CRM_meta_timeout="20000" configfile="/etc/apache2/httpd.conf" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="15" operation="stop" operation_key="DummyResource:1_stop_0" internal_operation_key="DummyResource:0_stop_0" on_node="domu1" on_node_uuid="domu1">
         <primitive id="DummyResource" long-id="DummyResource:1" 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"  state="/var/run/DummyResource.log"/>
+        <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_on_node="domu1" CRM_meta_on_node_uuid="domu1" CRM_meta_timeout="20000"  state="/var/run/DummyResource.log"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -81,7 +81,7 @@
     <action_set>
       <rsc_op id="17" operation="stop" operation_key="DummyResource:0_stop_0" internal_operation_key="DummyResource:1_stop_0" on_node="domu2" on_node_uuid="domu2">
         <primitive id="DummyResource" long-id="DummyResource:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  state="/var/run/DummyResource.log"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="domu2" CRM_meta_on_node_uuid="domu2" CRM_meta_timeout="20000"  state="/var/run/DummyResource.log"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2474.exp b/pengine/test10/bug-lf-2474.exp
index 78287be..8eca0af 100644
--- a/pengine/test10/bug-lf-2474.exp
+++ b/pengine/test10/bug-lf-2474.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="2" operation="start" operation_key="dummy-10s-timeout_start_0" on_node="hex-14" on_node_uuid="hex-14">
         <primitive id="dummy-10s-timeout" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_timeout="10000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_node="hex-14" CRM_meta_on_node_uuid="hex-14" CRM_meta_timeout="10000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="3" operation="start" operation_key="dummy-default-timeout_start_0" on_node="hex-14" on_node_uuid="hex-14">
         <primitive id="dummy-default-timeout" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="15000" />
+        <attributes CRM_meta_on_node="hex-14" CRM_meta_on_node_uuid="hex-14" CRM_meta_timeout="15000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2493.exp b/pengine/test10/bug-lf-2493.exp
index b47cda4..19c162a 100644
--- a/pengine/test10/bug-lf-2493.exp
+++ b/pengine/test10/bug-lf-2493.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="35" operation="start" operation_key="p_dummy2_start_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="p_dummy2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="36" operation="start" operation_key="p_dummy4_start_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="p_dummy4" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="37" operation="start" operation_key="p_dummy3_start_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="p_dummy3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -37,7 +37,7 @@
     <action_set>
       <rsc_op id="17" operation="delete" operation_key="res_Filesystem_nfs_fs1_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_Filesystem_nfs_fs1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -46,7 +46,7 @@
     <action_set>
       <rsc_op id="2" operation="delete" operation_key="res_Filesystem_nfs_fs1_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_Filesystem_nfs_fs1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="24" operation="delete" operation_key="res_drbd_nfs:0_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_drbd_nfs:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -64,7 +64,7 @@
     <action_set>
       <rsc_op id="3" operation="delete" operation_key="res_drbd_nfs:0_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_drbd_nfs:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -73,7 +73,7 @@
     <action_set>
       <rsc_op id="18" operation="delete" operation_key="res_Filesystem_nfs_fs2_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_Filesystem_nfs_fs2" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -82,7 +82,7 @@
     <action_set>
       <rsc_op id="4" operation="delete" operation_key="res_Filesystem_nfs_fs2_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_Filesystem_nfs_fs2" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -91,7 +91,7 @@
     <action_set>
       <rsc_op id="20" operation="delete" operation_key="res_Filesystem_nfs_fs3_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_Filesystem_nfs_fs3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -100,7 +100,7 @@
     <action_set>
       <rsc_op id="5" operation="delete" operation_key="res_Filesystem_nfs_fs3_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_Filesystem_nfs_fs3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -109,7 +109,7 @@
     <action_set>
       <rsc_op id="21" operation="delete" operation_key="res_exportfs_fs1_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_exportfs_fs1" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -118,7 +118,7 @@
     <action_set>
       <rsc_op id="6" operation="delete" operation_key="res_exportfs_fs1_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_exportfs_fs1" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -127,7 +127,7 @@
     <action_set>
       <rsc_op id="22" operation="delete" operation_key="res_exportfs_fs2_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_exportfs_fs2" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -136,7 +136,7 @@
     <action_set>
       <rsc_op id="7" operation="delete" operation_key="res_exportfs_fs2_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_exportfs_fs2" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -145,7 +145,7 @@
     <action_set>
       <rsc_op id="23" operation="delete" operation_key="res_exportfs_fs3_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_exportfs_fs3" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="8" operation="delete" operation_key="res_exportfs_fs3_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_exportfs_fs3" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -163,7 +163,7 @@
     <action_set>
       <rsc_op id="19" operation="delete" operation_key="res_drbd_nfs:1_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_drbd_nfs:1" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -172,7 +172,7 @@
     <action_set>
       <rsc_op id="9" operation="delete" operation_key="res_drbd_nfs:1_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_drbd_nfs:1" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -181,7 +181,7 @@
     <action_set>
       <rsc_op id="25" operation="delete" operation_key="res_LVM_nfs_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_LVM_nfs" class="ocf" provider="heartbeat" type="LVM"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -190,7 +190,7 @@
     <action_set>
       <rsc_op id="10" operation="delete" operation_key="res_LVM_nfs_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_LVM_nfs" class="ocf" provider="heartbeat" type="LVM"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -199,7 +199,7 @@
     <action_set>
       <rsc_op id="26" operation="delete" operation_key="res_LVM_p_vg-sap_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_LVM_p_vg-sap" class="ocf" provider="heartbeat" type="LVM"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -208,7 +208,7 @@
     <action_set>
       <rsc_op id="11" operation="delete" operation_key="res_LVM_p_vg-sap_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_LVM_p_vg-sap" class="ocf" provider="heartbeat" type="LVM"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -217,7 +217,7 @@
     <action_set>
       <rsc_op id="12" operation="delete" operation_key="res_exportfs_rootfs:0_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_exportfs_rootfs:0" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -226,7 +226,7 @@
     <action_set>
       <rsc_op id="28" operation="delete" operation_key="res_IPaddr2_nfs_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_IPaddr2_nfs" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -235,7 +235,7 @@
     <action_set>
       <rsc_op id="13" operation="delete" operation_key="res_IPaddr2_nfs_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_IPaddr2_nfs" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -244,7 +244,7 @@
     <action_set>
       <rsc_op id="29" operation="delete" operation_key="res_drbd_hpn78:0_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_drbd_hpn78:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -253,7 +253,7 @@
     <action_set>
       <rsc_op id="14" operation="delete" operation_key="res_drbd_hpn78:0_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_drbd_hpn78:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -262,7 +262,7 @@
     <action_set>
       <rsc_op id="31" operation="delete" operation_key="res_Filesystem_sap_db_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_Filesystem_sap_db" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -271,7 +271,7 @@
     <action_set>
       <rsc_op id="15" operation="delete" operation_key="res_Filesystem_sap_db_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_Filesystem_sap_db" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="32" operation="delete" operation_key="res_Filesystem_sap_ci_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_Filesystem_sap_ci" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -289,7 +289,7 @@
     <action_set>
       <rsc_op id="16" operation="delete" operation_key="res_Filesystem_sap_ci_delete_0" on_node="hpn07" on_node_uuid="hpn07">
         <primitive id="res_Filesystem_sap_ci" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn07" CRM_meta_on_node_uuid="hpn07" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -298,7 +298,7 @@
     <action_set>
       <rsc_op id="27" operation="delete" operation_key="res_exportfs_rootfs:1_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_exportfs_rootfs:1" class="ocf" provider="heartbeat" type="exportfs"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -307,7 +307,7 @@
     <action_set>
       <rsc_op id="30" operation="delete" operation_key="res_drbd_hpn78:1_delete_0" on_node="hpn08" on_node_uuid="hpn08">
         <primitive id="res_drbd_hpn78:1" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="hpn08" CRM_meta_on_node_uuid="hpn08" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2508.exp b/pengine/test10/bug-lf-2508.exp
index 363154d..bf70378 100644
--- a/pengine/test10/bug-lf-2508.exp
+++ b/pengine/test10/bug-lf-2508.exp
@@ -26,7 +26,7 @@
     <action_set>
       <rsc_op id="20" operation="monitor" operation_key="Dummy01_monitor_10000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="Dummy01" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -39,7 +39,7 @@
     <action_set>
       <rsc_op id="19" operation="start" operation_key="Dummy01_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="Dummy01" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -109,7 +109,7 @@
     <action_set>
       <rsc_op id="27" operation="monitor" operation_key="Dummy02_monitor_10000" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
         <primitive id="Dummy02" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="26" operation="start" operation_key="Dummy02_start_0" on_node="srv04" on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62">
         <primitive id="Dummy02" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="82d8b53b-a29d-40f5-9a1d-156bf3b7af62" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -336,7 +336,7 @@
     <action_set>
       <rsc_op id="108" operation="monitor" operation_key="prmStonith3-1:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-1" long-id="prmStonith3-1:1" class="stonith" type="external/stonith-helper"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="60000"  dead_check_target="192.168.40.30" hostlist="srv03" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  dead_check_target="192.168.40.30" hostlist="srv03" priority="1" run_quorum_check="yes" run_standby_wait="no" stonith-timeout="60s"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -345,7 +345,7 @@
     <action_set>
       <rsc_op id="110" operation="monitor" operation_key="prmStonith3-3:1_monitor_3600000" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-3" long-id="prmStonith3-3:1" class="stonith" type="external/ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="3600000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -358,7 +358,7 @@
     <action_set>
       <rsc_op id="109" operation="start" operation_key="prmStonith3-3:1_start_0" on_node="srv01" on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb">
         <primitive id="prmStonith3-3" long-id="prmStonith3-3:1" class="stonith" type="external/ssh"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="e2bc05d5-2a0f-4e2e-8566-bd1000f1cfeb" CRM_meta_timeout="60000"  hostlist="srv03" priority="3" stonith-timeout="60s"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2544.exp b/pengine/test10/bug-lf-2544.exp
index 1755130..64cd62a 100644
--- a/pengine/test10/bug-lf-2544.exp
+++ b/pengine/test10/bug-lf-2544.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="6" operation="promote" operation_key="s0:1_promote_0" on_node="node-1" on_node_uuid="node-1">
         <primitive id="s0" long-id="s0: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" />
+        <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_on_node="node-1" CRM_meta_on_node_uuid="node-1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp
index 44bdfca..f5b8236 100644
--- a/pengine/test10/bug-lf-2551.exp
+++ b/pengine/test10/bug-lf-2551.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="159" operation="start" operation_key="fencing-sbd_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="fencing-sbd" class="stonith" type="external/sbd"/>
-        <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000"  sbd_device="/dev/disk/by-id/dm-uuid-part1-mpath-3600508b400105b5a0001500000250000"/>
+        <attributes CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  sbd_device="/dev/disk/by-id/dm-uuid-part1-mpath-3600508b400105b5a0001500000250000"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -24,7 +24,7 @@
     <action_set>
       <rsc_op id="164" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-8" on_node_uuid="hex-8">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
+        <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_on_node="hex-8" CRM_meta_on_node_uuid="hex-8" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -33,7 +33,7 @@
     <action_set>
       <rsc_op id="163" operation="monitor" operation_key="dummy1_monitor_300000" on_node="hex-7" on_node_uuid="hex-7">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
+        <attributes CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_on_node="hex-7" CRM_meta_on_node_uuid="hex-7" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_role="Stopped" CRM_meta_timeout="10000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="162" operation="monitor" operation_key="dummy1_monitor_30000" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_record_pending="false" CRM_meta_timeout="10000" />
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="10000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="161" operation="start" operation_key="dummy1_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
+        <attributes CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2574.exp b/pengine/test10/bug-lf-2574.exp
index 5d0a58a..2b35f48 100644
--- a/pengine/test10/bug-lf-2574.exp
+++ b/pengine/test10/bug-lf-2574.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="main_rsc_monitor_10000" on_node="srv03" on_node_uuid="e2ffc1ed-3ebe-47e2-b51b-b0f04b454311">
         <primitive id="main_rsc" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="e2ffc1ed-3ebe-47e2-b51b-b0f04b454311" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="main_rsc_start_0" on_node="srv03" on_node_uuid="e2ffc1ed-3ebe-47e2-b51b-b0f04b454311">
         <primitive id="main_rsc" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv03" CRM_meta_on_node_uuid="e2ffc1ed-3ebe-47e2-b51b-b0f04b454311" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="main_rsc_stop_0" on_node="srv01" on_node_uuid="45f985d7-e7c8-4834-b01b-16b99526672b">
         <primitive id="main_rsc" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="45f985d7-e7c8-4834-b01b-16b99526672b" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -38,7 +38,7 @@
     <action_set>
       <rsc_op id="22" operation="stop" operation_key="prmPingd:0_stop_0" on_node="srv01" on_node_uuid="45f985d7-e7c8-4834-b01b-16b99526672b">
         <primitive id="prmPingd" long-id="prmPingd:0" class="ocf" provider="pacemaker" type="ping"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_timeout="60000"  host_list="192.168.40.1"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="45f985d7-e7c8-4834-b01b-16b99526672b" CRM_meta_timeout="60000"  host_list="192.168.40.1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2581.exp b/pengine/test10/bug-lf-2581.exp
index c04e478..421e75a 100644
--- a/pengine/test10/bug-lf-2581.exp
+++ b/pengine/test10/bug-lf-2581.exp
@@ -33,7 +33,7 @@
     <action_set>
       <rsc_op id="29" operation="monitor" operation_key="A:1_monitor_120000" on_node="queen" on_node_uuid="queen">
         <primitive id="A" long-id="A:1" class="ocf" provider="rgk" type="typeA"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -46,7 +46,7 @@
     <action_set>
       <rsc_op id="28" operation="start" operation_key="A:1_start_0" on_node="queen" on_node_uuid="queen">
         <primitive id="A" long-id="A:1" class="ocf" provider="rgk" type="typeA"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_requires="fencing" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -59,7 +59,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="A:1_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="A" long-id="A:1" class="ocf" provider="rgk" type="typeA"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="31" operation="monitor" operation_key="Z:1_monitor_120000" on_node="queen" on_node_uuid="queen">
         <primitive id="Z" long-id="Z:1" class="ocf" provider="rgk" type="typeZ"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="120000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -81,7 +81,7 @@
     <action_set>
       <rsc_op id="30" operation="start" operation_key="Z:1_start_0" on_node="queen" on_node_uuid="queen">
         <primitive id="Z" long-id="Z:1" class="ocf" provider="rgk" type="typeZ"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_requires="fencing" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -97,7 +97,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="Z:1_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="Z" long-id="Z:1" class="ocf" provider="rgk" type="typeZ"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -136,7 +136,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="B-1_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="B-1" class="ocf" provider="rgk" type="typeB"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeBdaemon-1"/>
+        <attributes CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeBdaemon-1"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -145,7 +145,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="C-1_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="C-1" class="ocf" provider="rgk" type="typeC"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeCdaemon-1"/>
+        <attributes CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeCdaemon-1"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="B-2_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="B-2" class="ocf" provider="rgk" type="typeB"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeBdaemon-2"/>
+        <attributes CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeBdaemon-2"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -163,7 +163,7 @@
     <action_set>
       <rsc_op id="18" operation="monitor" operation_key="C-2_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="C-2" class="ocf" provider="rgk" type="typeC"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeCdaemon-2"/>
+        <attributes CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000"  daemon="typeCdaemon-2"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -172,7 +172,7 @@
     <action_set>
       <rsc_op id="59" operation="monitor" operation_key="stonith-l2network:1_monitor_300000" on_node="queen" on_node_uuid="queen">
         <primitive id="stonith-l2network" long-id="stonith-l2network:1" class="stonith" type="l2network"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="300000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -185,7 +185,7 @@
     <action_set>
       <rsc_op id="58" operation="start" operation_key="stonith-l2network:1_start_0" on_node="queen" on_node_uuid="queen">
         <primitive id="stonith-l2network" long-id="stonith-l2network:1" class="stonith" type="l2network"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -198,7 +198,7 @@
     <action_set>
       <rsc_op id="19" operation="monitor" operation_key="stonith-l2network:1_monitor_0" on_node="queen" on_node_uuid="queen">
         <primitive id="stonith-l2network" long-id="stonith-l2network:1" class="stonith" type="l2network"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="queen" CRM_meta_on_node_uuid="queen" CRM_meta_op_target_rc="7" CRM_meta_timeout="15000"  nodelist="elvis;128.162.245.170;;1 queen;128.162.245.170;;2"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-lf-2606.exp b/pengine/test10/bug-lf-2606.exp
index 467e233..55f138b 100644
--- a/pengine/test10/bug-lf-2606.exp
+++ b/pengine/test10/bug-lf-2606.exp
@@ -15,7 +15,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_10000" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="7" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2613.exp b/pengine/test10/bug-lf-2613.exp
index e4dd227..47d7fc8 100644
--- a/pengine/test10/bug-lf-2613.exp
+++ b/pengine/test10/bug-lf-2613.exp
@@ -83,7 +83,7 @@
     <action_set>
       <rsc_op id="60" operation="monitor" operation_key="prmExPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <rsc_op id="59" operation="start" operation_key="prmExPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -115,7 +115,7 @@
     <action_set>
       <rsc_op id="58" operation="stop" operation_key="prmExPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -131,7 +131,7 @@
     <action_set>
       <rsc_op id="63" operation="monitor" operation_key="prmFsPostgreSQLDB1-1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -144,7 +144,7 @@
     <action_set>
       <rsc_op id="62" operation="start" operation_key="prmFsPostgreSQLDB1-1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -163,7 +163,7 @@
     <action_set>
       <rsc_op id="61" operation="stop" operation_key="prmFsPostgreSQLDB1-1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -179,7 +179,7 @@
     <action_set>
       <rsc_op id="66" operation="monitor" operation_key="prmFsPostgreSQLDB1-2_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -192,7 +192,7 @@
     <action_set>
       <rsc_op id="65" operation="start" operation_key="prmFsPostgreSQLDB1-2_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -211,7 +211,7 @@
     <action_set>
       <rsc_op id="64" operation="stop" operation_key="prmFsPostgreSQLDB1-2_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -227,7 +227,7 @@
     <action_set>
       <rsc_op id="69" operation="monitor" operation_key="prmFsPostgreSQLDB1-3_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -240,7 +240,7 @@
     <action_set>
       <rsc_op id="68" operation="start" operation_key="prmFsPostgreSQLDB1-3_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -259,7 +259,7 @@
     <action_set>
       <rsc_op id="67" operation="stop" operation_key="prmFsPostgreSQLDB1-3_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -275,7 +275,7 @@
     <action_set>
       <rsc_op id="72" operation="monitor" operation_key="prmIpPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -288,7 +288,7 @@
     <action_set>
       <rsc_op id="71" operation="start" operation_key="prmIpPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -307,7 +307,7 @@
     <action_set>
       <rsc_op id="70" operation="stop" operation_key="prmIpPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -323,7 +323,7 @@
     <action_set>
       <rsc_op id="74" operation="monitor" operation_key="prmApPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -336,7 +336,7 @@
     <action_set>
       <rsc_op id="73" operation="start" operation_key="prmApPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -355,7 +355,7 @@
     <action_set>
       <rsc_op id="2" operation="stop" operation_key="prmApPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2619.exp b/pengine/test10/bug-lf-2619.exp
index 4240db1..57aff38 100644
--- a/pengine/test10/bug-lf-2619.exp
+++ b/pengine/test10/bug-lf-2619.exp
@@ -83,7 +83,7 @@
     <action_set>
       <rsc_op id="65" operation="monitor" operation_key="prmExPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <rsc_op id="64" operation="start" operation_key="prmExPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -115,7 +115,7 @@
     <action_set>
       <rsc_op id="63" operation="stop" operation_key="prmExPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmExPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -131,7 +131,7 @@
     <action_set>
       <rsc_op id="68" operation="monitor" operation_key="prmFsPostgreSQLDB1-1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -144,7 +144,7 @@
     <action_set>
       <rsc_op id="67" operation="start" operation_key="prmFsPostgreSQLDB1-1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -163,7 +163,7 @@
     <action_set>
       <rsc_op id="66" operation="stop" operation_key="prmFsPostgreSQLDB1-1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -179,7 +179,7 @@
     <action_set>
       <rsc_op id="71" operation="monitor" operation_key="prmFsPostgreSQLDB1-2_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -192,7 +192,7 @@
     <action_set>
       <rsc_op id="70" operation="start" operation_key="prmFsPostgreSQLDB1-2_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -211,7 +211,7 @@
     <action_set>
       <rsc_op id="69" operation="stop" operation_key="prmFsPostgreSQLDB1-2_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-2" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -227,7 +227,7 @@
     <action_set>
       <rsc_op id="74" operation="monitor" operation_key="prmFsPostgreSQLDB1-3_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -240,7 +240,7 @@
     <action_set>
       <rsc_op id="73" operation="start" operation_key="prmFsPostgreSQLDB1-3_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -259,7 +259,7 @@
     <action_set>
       <rsc_op id="72" operation="stop" operation_key="prmFsPostgreSQLDB1-3_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmFsPostgreSQLDB1-3" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -275,7 +275,7 @@
     <action_set>
       <rsc_op id="77" operation="monitor" operation_key="prmIpPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -288,7 +288,7 @@
     <action_set>
       <rsc_op id="76" operation="start" operation_key="prmIpPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -307,7 +307,7 @@
     <action_set>
       <rsc_op id="75" operation="stop" operation_key="prmIpPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmIpPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -323,7 +323,7 @@
     <action_set>
       <rsc_op id="80" operation="monitor" operation_key="prmApPostgreSQLDB1_monitor_5000" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -336,7 +336,7 @@
     <action_set>
       <rsc_op id="79" operation="start" operation_key="prmApPostgreSQLDB1_start_0" on_node="sby1" on_node_uuid="sby1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="sby1" CRM_meta_on_node_uuid="sby1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -355,7 +355,7 @@
     <action_set>
       <rsc_op id="78" operation="stop" operation_key="prmApPostgreSQLDB1_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmApPostgreSQLDB1" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -368,7 +368,7 @@
     <action_set>
       <rsc_op id="7" operation="stop" operation_key="prmPingd:0_stop_0" on_node="act1" on_node_uuid="act1">
         <primitive id="prmPingd" long-id="prmPingd:0" class="ocf" provider="pacemaker" type="ping"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_timeout="100000"  dampen="0" host_list="192.168.201.254" multiplier="100" name="default_ping_set"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="5" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="ignore" CRM_meta_on_node="act1" CRM_meta_on_node_uuid="act1" CRM_meta_timeout="100000"  dampen="0" host_list="192.168.201.254" multiplier="100" name="default_ping_set"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-n-385265-2.exp b/pengine/test10/bug-n-385265-2.exp
index 4c38b55..2f536dc 100644
--- a/pengine/test10/bug-n-385265-2.exp
+++ b/pengine/test10/bug-n-385265-2.exp
@@ -59,7 +59,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="resource_ip_common_monitor_30000" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
         <primitive id="resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_start_delay="30000" CRM_meta_timeout="25000"  ip="10.116.38.10"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="ih01" CRM_meta_on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" CRM_meta_start_delay="30000" CRM_meta_timeout="25000"  ip="10.116.38.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -72,7 +72,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="resource_ip_common_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
         <primitive id="resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.116.38.10"/>
+        <attributes CRM_meta_on_node="ih01" CRM_meta_on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" CRM_meta_timeout="20000"  ip="10.116.38.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -88,7 +88,7 @@
      <action_set>
       <rsc_op id="2" operation="stop" operation_key="resource_ip_common_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5">
         <primitive id="resource_ip_common" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_timeout="20000"  ip="10.116.38.10"/>
+        <attributes CRM_meta_on_node="ih02" CRM_meta_on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5" CRM_meta_timeout="20000"  ip="10.116.38.10"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -104,7 +104,7 @@
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="resource_idvscommon_monitor_30000" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
         <primitive id="resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_start_delay="120000" CRM_meta_timeout="25000"  site="common"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="ih01" CRM_meta_on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" CRM_meta_start_delay="120000" CRM_meta_timeout="25000"  site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -117,7 +117,7 @@
      <action_set>
       <rsc_op id="7" operation="start" operation_key="resource_idvscommon_start_0" on_node="ih01" on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327">
         <primitive id="resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-        <attributes CRM_meta_timeout="20000"  site="common"/>
+        <attributes CRM_meta_on_node="ih01" CRM_meta_on_node_uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" CRM_meta_timeout="20000"  site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -136,7 +136,7 @@
      <action_set>
       <rsc_op id="6" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5">
         <primitive id="resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-        <attributes CRM_meta_timeout="20000"  site="common"/>
+        <attributes CRM_meta_on_node="ih02" CRM_meta_on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5" CRM_meta_timeout="20000"  site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-n-385265.exp b/pengine/test10/bug-n-385265.exp
index 82624fa..c8bad25 100644
--- a/pengine/test10/bug-n-385265.exp
+++ b/pengine/test10/bug-n-385265.exp
@@ -26,7 +26,7 @@
      <action_set>
        <rsc_op id="2" operation="stop" operation_key="resource_idvscommon_stop_0" on_node="ih02" on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5">
         <primitive id="resource_idvscommon" class="ocf" provider="dfs" type="idvs"/>
-        <attributes CRM_meta_timeout="20000"  site="common"/>
+        <attributes CRM_meta_on_node="ih02" CRM_meta_on_node_uuid="57226bfc-310f-409b-8b3d-49d93498e4b5" CRM_meta_timeout="20000"  site="common"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-n-387749.exp b/pengine/test10/bug-n-387749.exp
index 3ca8c2a..bba3012 100644
--- a/pengine/test10/bug-n-387749.exp
+++ b/pengine/test10/bug-n-387749.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="36" operation="notify" operation_key="export_home_ocfs2:0_post_notify_start_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="export_home_ocfs2:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="9" operation="start" operation_key="export_home_ocfs2:0_start_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="export_home_ocfs2:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="export_home_ocfs2:0_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="export_home_ocfs2:0" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -38,7 +38,7 @@
      <action_set>
       <rsc_op id="38" operation="notify" operation_key="export_home_ocfs2:1_post_notify_start_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10">
         <primitive id="export_home_ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_on_node="power720-2" CRM_meta_on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -51,7 +51,7 @@
      <action_set>
       <rsc_op id="37" operation="notify" operation_key="export_home_ocfs2:1_pre_notify_start_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10">
         <primitive id="export_home_ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_notify_active_resource="export_home_ocfs2:1" CRM_meta_notify_active_uname="power720-2" CRM_meta_notify_all_uname="power720-1 power720-2 power720-4" CRM_meta_notify_available_uname="power720-4 power720-1 power720-2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="export_home_ocfs2:0 export_home_ocfs2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="export_home_ocfs2:0" CRM_meta_notify_start_uname="power720-1" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_on_node="power720-2" CRM_meta_on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -64,7 +64,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="export_home_ocfs2:1_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="export_home_ocfs2:1" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
     <inputs/>
@@ -73,7 +73,7 @@
      <action_set>
       <rsc_op id="6" operation="monitor" operation_key="export_home_ocfs2:2_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="export_home_ocfs2:2" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="true" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  device="/dev/sda" directory="/mnt" fstype="ocfs2" options="rw,sync"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -233,7 +233,7 @@
      <action_set>
       <rsc_op id="26" operation="monitor" operation_key="resource_ipaddr1_single_monitor_5000" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_ipaddr1_single" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_start_delay="1000" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
+        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_start_delay="1000" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -246,7 +246,7 @@
      <action_set>
       <rsc_op id="25" operation="start" operation_key="resource_ipaddr1_single_start_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_ipaddr1_single" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
+        <attributes CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -265,7 +265,7 @@
      <action_set>
       <rsc_op id="24" operation="stop" operation_key="resource_ipaddr1_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10">
         <primitive id="resource_ipaddr1_single" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
+        <attributes CRM_meta_on_node="power720-2" CRM_meta_on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -284,7 +284,7 @@
      <action_set>
       <rsc_op id="7" operation="monitor" operation_key="resource_ipaddr1_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_ipaddr1_single" class="ocf" provider="heartbeat" type="IPaddr"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
+        <attributes CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" cidr_netmask="24"  ip="192.168.2.6" nic="eth1" target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -293,7 +293,7 @@
      <action_set>
       <rsc_op id="29" operation="monitor" operation_key="resource_nfsserver_single_monitor_15000" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_nfsserver_single" class="lsb" type="nfsserver"/>
-        <attributes CRM_meta_enabled="true" CRM_meta_interval="15000" CRM_meta_name="monitor" CRM_meta_on_fail="stop" CRM_meta_role="Started" CRM_meta_start_delay="15000" CRM_meta_timeout="15000" />
+        <attributes CRM_meta_enabled="true" CRM_meta_interval="15000" CRM_meta_name="monitor" CRM_meta_on_fail="stop" CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_role="Started" CRM_meta_start_delay="15000" CRM_meta_timeout="15000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -306,7 +306,7 @@
      <action_set>
       <rsc_op id="28" operation="start" operation_key="resource_nfsserver_single_start_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_nfsserver_single" class="lsb" type="nfsserver"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -328,7 +328,7 @@
      <action_set>
       <rsc_op id="27" operation="stop" operation_key="resource_nfsserver_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10">
         <primitive id="resource_nfsserver_single" class="lsb" type="nfsserver"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="power720-2" CRM_meta_on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -344,7 +344,7 @@
      <action_set>
       <rsc_op id="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3">
         <primitive id="resource_nfsserver_single" class="lsb" type="nfsserver"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="15000" />
+        <attributes CRM_meta_on_node="power720-1" CRM_meta_on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="15000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-pm-11.exp b/pengine/test10/bug-pm-11.exp
index 4576a78..505e51e 100644
--- a/pengine/test10/bug-pm-11.exp
+++ b/pengine/test10/bug-pm-11.exp
@@ -30,7 +30,7 @@
      <action_set>
       <rsc_op id="8" operation="start" operation_key="stateful-2:0_start_0" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
         <primitive id="stateful-2:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-b" CRM_meta_on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -43,7 +43,7 @@
      <action_set>
       <rsc_op id="4" operation="monitor" operation_key="stateful-2:0_monitor_0" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
         <primitive id="stateful-2:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-b" CRM_meta_on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs/>
@@ -52,7 +52,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="stateful-2:0_monitor_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
@@ -112,7 +112,7 @@
      <action_set>
       <rsc_op id="22" operation="promote" operation_key="stateful-2:1_promote_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -128,7 +128,7 @@
      <action_set>
       <rsc_op id="21" operation="start" operation_key="stateful-2:1_start_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -141,7 +141,7 @@
      <action_set>
       <rsc_op id="5" operation="monitor" operation_key="stateful-2:1_monitor_0" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-b" CRM_meta_on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
     <inputs/>
@@ -150,7 +150,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="stateful-2:1_monitor_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-pm-12.exp b/pengine/test10/bug-pm-12.exp
index bea17dc..ced0661 100644
--- a/pengine/test10/bug-pm-12.exp
+++ b/pengine/test10/bug-pm-12.exp
@@ -60,7 +60,7 @@
      <action_set>
       <rsc_op id="6" operation="stop" operation_key="stateful-2:0_stop_0" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
         <primitive id="stateful-2:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-b" CRM_meta_on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -73,7 +73,7 @@
      <action_set>
       <rsc_op id="2" operation="start" operation_key="stateful-2:0_start_0" on_node="node-b" on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2">
         <primitive id="stateful-2:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-b" CRM_meta_on_node_uuid="9b262633-815c-4e5e-8f63-76486cab9ad2" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -197,7 +197,7 @@
      <action_set>
       <rsc_op id="21" operation="promote" operation_key="stateful-2:1_promote_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -213,7 +213,7 @@
      <action_set>
       <rsc_op id="20" operation="stop" operation_key="stateful-2:1_stop_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -229,7 +229,7 @@
      <action_set>
       <rsc_op id="19" operation="demote" operation_key="stateful-2:1_demote_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -242,7 +242,7 @@
      <action_set>
       <rsc_op id="3" operation="start" operation_key="stateful-2:1_start_0" on_node="node-a" on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000"  test1="1" test2="2"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_on_node="node-a" CRM_meta_on_node_uuid="babfee4b-9c89-4df2-8ccb-3de2a3587d8d" CRM_meta_timeout="20000"  test1="1" test2="2"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp
index 0c3430c..16b6b77 100644
--- a/pengine/test10/bug-rh-1097457.exp
+++ b/pengine/test10/bug-rh-1097457.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="37" operation="start" operation_key="VM2_start_0" on_node="lama3" on_node_uuid="2">
         <primitive id="VM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_name="start" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="90000000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="90000000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="36" operation="stop" operation_key="VM2_stop_0" on_node="lama3" on_node_uuid="2">
         <primitive id="VM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_name="stop" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="90000000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
+        <attributes CRM_meta_name="stop" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="90000000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -32,7 +32,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="VM2_monitor_10000" on_node="lama3" on_node_uuid="2">
         <primitive id="VM2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="30000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_remote_node="lamaVM2" CRM_meta_timeout="30000" config="/etc/libvirt/qemu/VM2.xml"  hypervisor="qemu:///system"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -45,7 +45,7 @@
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="FSlun3_monitor_10000" on_node="lama2" on_node_uuid="1">
         <primitive id="FSlun3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_timeout="20000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_on_node="lama2" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -58,7 +58,7 @@
     <action_set>
       <rsc_op id="41" operation="start" operation_key="FSlun3_start_0" on_node="lama2" on_node_uuid="1">
         <primitive id="FSlun3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_name="start" CRM_meta_timeout="60000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_node="lama2" CRM_meta_on_node_uuid="1" CRM_meta_timeout="60000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -92,7 +92,7 @@
     <action_set>
       <rsc_op id="21" operation="monitor" operation_key="FSlun3_monitor_10000" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FSlun3" class="ocf" provider="heartbeat" type="Filesystem"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_timeout="20000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="fence" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000"  device="-L FSlun3" directory="/lun3" fstype="ext4"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -168,7 +168,7 @@
     <action_set>
       <rsc_op id="72" operation="start" operation_key="FAKE4_start_0" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -208,7 +208,7 @@
     <action_set>
       <rsc_op id="23" operation="monitor" operation_key="FAKE4_monitor_30000" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE4" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -224,7 +224,7 @@
     <action_set>
       <rsc_op id="74" operation="start" operation_key="FAKE4-IP_start_0" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE4-IP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_name="start" CRM_meta_timeout="20000" cidr_netmask="16"  ip="10.1.1.54"/>
+        <attributes CRM_meta_name="start" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" cidr_netmask="16"  ip="10.1.1.54"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -264,7 +264,7 @@
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="FAKE4-IP_monitor_30000" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE4-IP" class="ocf" provider="heartbeat" type="IPaddr2"/>
-        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="20000" cidr_netmask="16"  ip="10.1.1.54"/>
+        <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" cidr_netmask="16"  ip="10.1.1.54"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="84" operation="start" operation_key="FAKE6_start_0" internal_operation_key="FAKE6:2_start_0" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE6" long-id="FAKE6:2" class="ocf" provider="heartbeat" 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_name="start" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -317,7 +317,7 @@
     <action_set>
       <rsc_op id="22" operation="monitor" operation_key="FAKE6_monitor_30000" internal_operation_key="FAKE6:2_monitor_30000" on_node="lamaVM2" on_node_uuid="lamaVM2" router_node="lama3">
         <primitive id="FAKE6" long-id="FAKE6:2" class="ocf" provider="heartbeat" 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_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="lamaVM2" CRM_meta_on_node_uuid="lamaVM2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -387,7 +387,7 @@
     <action_set>
       <rsc_op id="92" operation="start" operation_key="lamaVM2_start_0" on_node="lama3" on_node_uuid="2">
         <primitive id="lamaVM2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="VM2" CRM_meta_name="start" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_container="VM2" CRM_meta_name="start" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -406,7 +406,7 @@
     <action_set>
       <rsc_op id="91" operation="stop" operation_key="lamaVM2_stop_0" on_node="lama3" on_node_uuid="2">
         <primitive id="lamaVM2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="VM2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_container="VM2" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
         <downed>
           <node id="lamaVM2"/>
         </downed>
@@ -418,7 +418,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="lamaVM2_monitor_30000" on_node="lama3" on_node_uuid="2">
         <primitive id="lamaVM2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="VM2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" />
+        <attributes CRM_meta_container="VM2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="lama3" CRM_meta_on_node_uuid="2" CRM_meta_timeout="30000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-rh-880249.exp b/pengine/test10/bug-rh-880249.exp
index 97749e6..c66bd8c 100644
--- a/pengine/test10/bug-rh-880249.exp
+++ b/pengine/test10/bug-rh-880249.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="12" operation="start" operation_key="dummystateful_start_0" on_node="18node3" on_node_uuid="3">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -22,7 +22,7 @@
     <action_set>
       <rsc_op id="11" operation="stop" operation_key="dummystateful_stop_0" on_node="18node3" on_node_uuid="3">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -41,7 +41,7 @@
     <action_set>
       <rsc_op id="10" operation="stop" operation_key="dummystateful_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -60,7 +60,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="dummystateful_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -79,7 +79,7 @@
     <action_set>
       <rsc_op id="8" operation="demote" operation_key="dummystateful_demote_0" on_node="18node3" on_node_uuid="3">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -88,7 +88,7 @@
     <action_set>
       <rsc_op id="7" operation="demote" operation_key="dummystateful_demote_0" on_node="18node1" on_node_uuid="1">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -97,7 +97,7 @@
     <action_set>
       <rsc_op id="6" operation="demote" operation_key="dummystateful_demote_0" on_node="18node2" on_node_uuid="2">
         <primitive id="dummystateful" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/bug-suse-707150.exp b/pengine/test10/bug-suse-707150.exp
index c4d77c9..8254cf6 100644
--- a/pengine/test10/bug-suse-707150.exp
+++ b/pengine/test10/bug-suse-707150.exp
@@ -15,7 +15,7 @@
     <action_set>
       <rsc_op id="17" operation="start" operation_key="o2cb:0_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="o2cb" long-id="o2cb:0" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="18" operation="start" operation_key="clvm:0_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="clvm" long-id="clvm:0" class="ocf" provider="lvm2" type="clvmd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="30"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="30"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -44,7 +44,7 @@
     <action_set>
       <rsc_op id="19" operation="start" operation_key="cmirrord:0_start_0" on_node="hex-0" on_node_uuid="hex-0">
         <primitive id="cmirrord" long-id="cmirrord:0" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="60"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-0" CRM_meta_on_node_uuid="hex-0" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="60"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -72,7 +72,7 @@
     <action_set>
       <rsc_op id="24" operation="start" operation_key="dlm:1_start_0" on_node="hex-9" on_node_uuid="hex-9">
         <primitive id="dlm" long-id="dlm:1" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -85,7 +85,7 @@
     <action_set>
       <rsc_op id="25" operation="start" operation_key="o2cb:1_start_0" on_node="hex-9" on_node_uuid="hex-9">
         <primitive id="o2cb" long-id="o2cb:1" class="ocf" provider="ocfs2" type="o2cb"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_record_pending="false" CRM_meta_timeout="240000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -101,7 +101,7 @@
     <action_set>
       <rsc_op id="26" operation="start" operation_key="clvm:1_start_0" on_node="hex-9" on_node_uuid="hex-9">
         <primitive id="clvm" long-id="clvm:1" class="ocf" provider="lvm2" type="clvmd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="30"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="30"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -117,7 +117,7 @@
     <action_set>
       <rsc_op id="27" operation="start" operation_key="cmirrord:1_start_0" on_node="hex-9" on_node_uuid="hex-9">
         <primitive id="cmirrord" long-id="cmirrord:1" class="ocf" provider="lvm2" type="cmirrord"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="60"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  daemon_timeout="60"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -133,7 +133,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="vg1:1_monitor_0" on_node="hex-9" on_node_uuid="hex-9">
         <primitive id="vg1" long-id="vg1:1" class="ocf" provider="heartbeat" type="LVM"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  volgrpname="cluster-vg"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="hex-9" CRM_meta_on_node_uuid="hex-9" CRM_meta_op_target_rc="7" CRM_meta_record_pending="false" CRM_meta_timeout="240000"  volgrpname="cluster-vg"/>
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/clone-anon-dup.exp b/pengine/test10/clone-anon-dup.exp
index 725c82c..1af059f 100644
--- a/pengine/test10/clone-anon-dup.exp
+++ b/pengine/test10/clone-anon-dup.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="stonith-1_start_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -22,7 +22,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="wc03" CRM_meta_on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -31,7 +31,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -40,7 +40,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="stonith-1" class="stonith" type="dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="wc01" CRM_meta_on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -76,7 +76,7 @@
     <action_set>
       <rsc_op id="26" operation="stop" operation_key="apache2:0_stop_0" internal_operation_key="apache2:2_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="apache2:0" long-id="apache2:2" class="ocf" provider="heartbeat" type="apache"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" clone-max="2" clone-node-max="1" configfile="/etc/apache2/apache2.conf"  envfiles="/etc/apache2/envvars" httpd="/usr/sbin/apache2" options="-k start" statusurl="http://localhost/server-status/"/>
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="wc02" CRM_meta_on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" CRM_meta_timeout="20000" clone-max="2" clone-node-max="1" configfile="/etc/apache2/apache2.conf"  envfiles="/etc/apache2/envvars" httpd="/usr/sbin/apache2" options="-k start" statusurl="http://localhost/server-status/"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/clone-anon-failcount.exp b/pengine/test10/clone-anon-failcount.exp
index 1d8c7f9..24a8393 100644
--- a/pengine/test10/clone-anon-failcount.exp
+++ b/pengine/test10/clone-anon-failcount.exp
@@ -74,7 +74,7 @@
     <action_set>
       <rsc_op id="34" operation="start" operation_key="UmVIPcheck_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmVIPcheck" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_start_delay="2000" CRM_meta_timeout="90000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_start_delay="2000" CRM_meta_timeout="90000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -90,7 +90,7 @@
     <action_set>
       <rsc_op id="33" operation="stop" operation_key="UmVIPcheck_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="UmVIPcheck" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -106,7 +106,7 @@
     <action_set>
       <rsc_op id="37" operation="monitor" operation_key="UmIPaddr_monitor_10000" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmIPaddr" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -119,7 +119,7 @@
     <action_set>
       <rsc_op id="36" operation="start" operation_key="UmIPaddr_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmIPaddr" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -138,7 +138,7 @@
     <action_set>
       <rsc_op id="35" operation="stop" operation_key="UmIPaddr_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="UmIPaddr" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="40" operation="monitor" operation_key="UmDummy01_monitor_10000" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmDummy01" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="ignore" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="ignore" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -167,7 +167,7 @@
     <action_set>
       <rsc_op id="39" operation="start" operation_key="UmDummy01_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmDummy01" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -186,7 +186,7 @@
     <action_set>
       <rsc_op id="38" operation="stop" operation_key="UmDummy01_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="UmDummy01" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="stop" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="stop" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -202,7 +202,7 @@
     <action_set>
       <rsc_op id="43" operation="monitor" operation_key="UmDummy02_monitor_10000" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmDummy02" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="standby" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="standby" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -215,7 +215,7 @@
     <action_set>
       <rsc_op id="42" operation="start" operation_key="UmDummy02_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="UmDummy02" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="start" CRM_meta_on_fail="standby" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="start" CRM_meta_on_fail="standby" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_requires="fencing" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -234,7 +234,7 @@
     <action_set>
       <rsc_op id="41" operation="stop" operation_key="UmDummy02_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="UmDummy02" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -310,7 +310,7 @@
     <action_set>
       <rsc_op id="90" operation="start" operation_key="clnUMdummy01:1_start_0" internal_operation_key="clnUMdummy01:0_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy01" long-id="clnUMdummy01:1" class="ocf" provider="pacemaker" 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_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -326,7 +326,7 @@
     <action_set>
       <rsc_op id="15" operation="stop" operation_key="clnUMdummy01:1_stop_0" internal_operation_key="clnUMdummy01:0_stop_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy01" long-id="clnUMdummy01:1" class="ocf" provider="pacemaker" 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_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -342,7 +342,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="clnUMdummy01:1_monitor_10000" internal_operation_key="clnUMdummy01:0_monitor_10000" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy01" long-id="clnUMdummy01:1" class="ocf" provider="pacemaker" 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_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -355,7 +355,7 @@
     <action_set>
       <rsc_op id="92" operation="start" operation_key="clnUMdummy02:1_start_0" internal_operation_key="clnUMdummy02:0_start_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy02" long-id="clnUMdummy02:1" class="ocf" provider="pacemaker" 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_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="start" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -374,7 +374,7 @@
     <action_set>
       <rsc_op id="91" operation="stop" operation_key="clnUMdummy02:1_stop_0" internal_operation_key="clnUMdummy02:0_stop_0" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy02" long-id="clnUMdummy02:1" class="ocf" provider="pacemaker" 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_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -387,7 +387,7 @@
     <action_set>
       <rsc_op id="16" operation="monitor" operation_key="clnUMdummy02:1_monitor_10000" internal_operation_key="clnUMdummy02:0_monitor_10000" on_node="srv04" on_node_uuid="srv04">
         <primitive id="clnUMdummy02" long-id="clnUMdummy02:1" class="ocf" provider="pacemaker" 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_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_fail="restart" CRM_meta_on_node="srv04" CRM_meta_on_node_uuid="srv04" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -430,7 +430,7 @@
     <action_set>
       <rsc_op id="97" operation="stop" operation_key="clnUMdummy01:0_stop_0" internal_operation_key="clnUMdummy01:1_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="clnUMdummy01" long-id="clnUMdummy01:0" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -446,7 +446,7 @@
     <action_set>
       <rsc_op id="98" operation="stop" operation_key="clnUMdummy02:0_stop_0" internal_operation_key="clnUMdummy02:1_stop_0" on_node="srv01" on_node_uuid="srv01">
         <primitive id="clnUMdummy02" long-id="clnUMdummy02:0" class="ocf" provider="pacemaker" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_name="stop" CRM_meta_notify="false" CRM_meta_on_fail="block" CRM_meta_on_node="srv01" CRM_meta_on_node_uuid="srv01" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/clone-anon-probe-1.exp b/pengine/test10/clone-anon-probe-1.exp
index 2232a21..e5610b4 100644
--- a/pengine/test10/clone-anon-probe-1.exp
+++ b/pengine/test10/clone-anon-probe-1.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="drbd0:0_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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"  drbd_resource="r0"/>
+        <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_on_node="mysql-01" CRM_meta_on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="2" operation="monitor" operation_key="drbd0:0_monitor_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
-        <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"  drbd_resource="r0"/>
+        <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_on_node="mysql-01" CRM_meta_on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs/>
@@ -25,7 +25,7 @@
      <action_set>
       <rsc_op id="5" operation="start" operation_key="drbd0:1_start_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="mysql-02" CRM_meta_on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
      <action_set>
       <rsc_op id="3" operation="monitor" operation_key="drbd0:1_monitor_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="1" 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"  drbd_resource="r0"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="mysql-02" CRM_meta_on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  drbd_resource="r0"/>
       </rsc_op>
      </action_set>
     <inputs/>
diff --git a/pengine/test10/clone-anon-probe-2.exp b/pengine/test10/clone-anon-probe-2.exp
index ec55079..af914d3 100644
--- a/pengine/test10/clone-anon-probe-2.exp
+++ b/pengine/test10/clone-anon-probe-2.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="drbd0:1_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="mysql-01" CRM_meta_on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/clone-colocate-instance-1.exp b/pengine/test10/clone-colocate-instance-1.exp
index 9d9fecc..92460c3 100644
--- a/pengine/test10/clone-colocate-instance-1.exp
+++ b/pengine/test10/clone-colocate-instance-1.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="dummy1_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="dummy1_monitor_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="dummy1_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -37,7 +37,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="dummy2_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="dummy2_monitor_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -62,7 +62,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="dummy2_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="dummy:0_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy" long-id="dummy: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" />
+        <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_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="dummy:0_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy" long-id="dummy: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" />
+        <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_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -93,7 +93,7 @@
     <action_set>
       <rsc_op id="11" operation="start" operation_key="dummy:1_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy" long-id="dummy:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -106,7 +106,7 @@
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="dummy:1_monitor_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy" long-id="dummy:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" 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" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
diff --git a/pengine/test10/clone-colocate-instance-2.exp b/pengine/test10/clone-colocate-instance-2.exp
index 672c7fe..85bb239 100644
--- a/pengine/test10/clone-colocate-instance-2.exp
+++ b/pengine/test10/clone-colocate-instance-2.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="start" operation_key="dummy1_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="dummy1_monitor_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="dummy1_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -37,7 +37,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="dummy2_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="dummy2_monitor_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -62,7 +62,7 @@
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="dummy2_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy2" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="dummy:0_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy" long-id="dummy: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" />
+        <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_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="dummy:0_monitor_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="dummy" long-id="dummy: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" />
+        <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_on_node="alice.demo" CRM_meta_on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -93,7 +93,7 @@
     <action_set>
       <rsc_op id="11" operation="start" operation_key="dummy:1_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="dummy" long-id="dummy:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="bob.demo" CRM_meta_on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -106,7 +106,7 @@
     <action_