diff --git a/cts/scheduler/bug-1572-1.xml b/cts/scheduler/bug-1572-1.xml
index f2736854e9..c8d58e04be 100644
--- a/cts/scheduler/bug-1572-1.xml
+++ b/cts/scheduler/bug-1572-1.xml
@@ -1,193 +1,192 @@
 <cib admin_epoch="0" epoch="65" num_updates="13878" dc-uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21896" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21905" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21914" name="stop-orphan-actions" value="true"/>
-        <nvpair id="nvpair.id21933" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" type="member">
         <instance_attributes id="instance_attributes.id21994"/>
         <instance_attributes id="instance_attributes.id22002">
           <nvpair name="master-rsc_drbd_7788:1" id="nvpair.id22009" value="100"/>
           <nvpair id="nvpair.id22019" name="master-rsc_drbd_7788:0" value="100"/>
         </instance_attributes>
       </node>
       <node id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" type="member">
         <instance_attributes id="instance_attributes.id22041"/>
         <instance_attributes id="instance_attributes.id22049">
           <nvpair id="nvpair.id22056" name="master-rsc_drbd_7788:0" value="100"/>
           <nvpair id="nvpair.id22065" name="master-rsc_drbd_7788:1" value="100"/>
         </instance_attributes>
       </node>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <clone id="ms_drbd_7788">
         <primitive id="rsc_drbd_7788" class="ocf" type="drbd" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22141">
             <nvpair id="nvpair.id22148" name="drbd_resource" value="pgsql"/>
             <nvpair id="nvpair.id22157" name="dummy" value="cause_restart"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-ms_drbd_7788.meta">
           <nvpair id="notify.meta.auto-82" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-83" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-89" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-91" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-93" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-95" name="promoted-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <group id="grp_pgsql_mirror">
         <meta_attributes id="meta_attributes.id22200">
           <nvpair id="nvpair.id22206" name="restart-type" value="restart"/>
         </meta_attributes>
         <primitive id="fs_mirror" class="ocf" type="Filesystem" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22227">
             <nvpair id="nvpair.id22234" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22243" name="directory" value="/mirror"/>
             <nvpair id="nvpair.id22252" name="fstype" value="ext3"/>
             <nvpair id="nvpair.id22260" name="notify" value="true"/>
           </instance_attributes>
         </primitive>
         <instance_attributes id="instance_attributes.id22272"/>
         <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22290">
             <nvpair id="nvpair.id22297" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
             <nvpair id="nvpair.id22306" name="start_opt" value="-p 5555"/>
             <nvpair id="nvpair.id22315" name="psql" value="/usr/local/pgsql/bin/psql"/>
             <nvpair name="pgdata" id="nvpair.id22324" value="/mirror/pgsql/data_hb"/>
             <nvpair id="nvpair.id22333" name="pgdba" value="postgres"/>
             <nvpair id="nvpair.id22341" name="logfile" value="/var/log/pg.log"/>
             <nvpair id="nvpair.id22350" name="pgport" value="5555"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/>
           </operations>
         </primitive>
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="25s" id="IPaddr_147_81_84_133_mon" timeout="25s" start-delay="0" enabled="true" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22408">
             <nvpair id="nvpair.id22415" name="ip" value="147.81.84.133"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-grp_pgsql_mirror.meta">
           <nvpair id="ordered.meta.auto-118" name="ordered" value="true"/>
           <nvpair id="collocated.meta.auto-118" name="collocated" value="true"/>
         </meta_attributes>
       </group>
     </resources>
     <constraints>
       <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote" kind="Optional"/>
       <rsc_location id="locate_drbd" rsc="ms_drbd_7788">
         <rule id="rule_drbd_on_tk" role="Master" score="100">
           <expression id="expression.id22465" attribute="#uname" operation="eq" value="arc-tkincaidlx.wsicorp.com"/>
         </rule>
       </rsc_location>
       <rsc_colocation id="fs_on_drbd_master" rsc="grp_pgsql_mirror" with-rsc="ms_drbd_7788" with-rsc-role="Master" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" shutdown="1178215411" expected="down">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22518">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" transition-key="33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" transition-key="41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" transition-key="38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_start_0" operation="start" transition-key="4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_promote_0" operation="notify" transition-key="60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_promote_0" operation="promote" transition-key="6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_promote_0" operation="notify" transition-key="61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_demote_0" operation="notify" transition-key="57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_demote_0" operation="demote" transition-key="8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_demote_0" operation="notify" transition-key="58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="26" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id23117">
           <nvpair id="nvpair.id23124" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23164">
           <nvpair id="nvpair.id23171" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id23188">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_start_0" operation="start" transition-key="6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_stop_0" operation="notify" transition-key="38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_stop_0" operation="stop" transition-key="6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_promote_0" operation="notify" transition-key="52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_promote_0" operation="notify" transition-key="53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_demote_0" operation="notify" transition-key="49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="19" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_promote_0" operation="promote" transition-key="8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_demote_0" operation="notify" transition-key="50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/bug-1572-2.xml b/cts/scheduler/bug-1572-2.xml
index b06ac9cf54..1d31a71874 100644
--- a/cts/scheduler/bug-1572-2.xml
+++ b/cts/scheduler/bug-1572-2.xml
@@ -1,182 +1,181 @@
 <cib admin_epoch="0" epoch="65" num_updates="13878" dc-uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21896" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21905" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21914" name="stop-orphan-actions" value="true"/>
-        <nvpair id="nvpair.id21933" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" type="member">
         <instance_attributes id="instance_attributes.id21994"/>
         <instance_attributes id="instance_attributes.id22002"/>
       </node>
       <node id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" type="member">
         <instance_attributes id="instance_attributes.id22021"/>
         <instance_attributes id="instance_attributes.id22029"/>
       </node>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <clone id="ms_drbd_7788">
         <primitive id="rsc_drbd_7788" class="ocf" type="drbd" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22104">
             <nvpair id="nvpair.id22110" name="drbd_resource" value="pgsql"/>
             <nvpair id="nvpair.id22120" name="dummy" value="cause_restart"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-ms_drbd_7788.meta">
           <nvpair id="notify.meta.auto-74" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-75" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-81" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-83" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-85" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-87" name="promoted-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <group id="grp_pgsql_mirror">
         <meta_attributes id="meta_attributes.id22162">
           <nvpair id="nvpair.id22169" name="restart-type" value="restart"/>
         </meta_attributes>
         <primitive id="fs_mirror" class="ocf" type="Filesystem" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22190">
             <nvpair id="nvpair.id22196" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22205" name="directory" value="/mirror"/>
             <nvpair id="nvpair.id22214" name="fstype" value="ext3"/>
             <nvpair id="nvpair.id22223" name="notify" value="true"/>
           </instance_attributes>
         </primitive>
         <instance_attributes id="instance_attributes.id22234"/>
         <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22253">
             <nvpair id="nvpair.id22259" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
             <nvpair id="nvpair.id22268" name="start_opt" value="-p 5555"/>
             <nvpair id="nvpair.id22277" name="psql" value="/usr/local/pgsql/bin/psql"/>
             <nvpair name="pgdata" id="nvpair.id22286" value="/mirror/pgsql/data_hb"/>
             <nvpair id="nvpair.id22295" name="pgdba" value="postgres"/>
             <nvpair id="nvpair.id22304" name="logfile" value="/var/log/pg.log"/>
             <nvpair id="nvpair.id22313" name="pgport" value="5555"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/>
           </operations>
         </primitive>
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="25s" id="IPaddr_147_81_84_133_mon" timeout="25s" start-delay="0" enabled="true" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22371">
             <nvpair id="nvpair.id22377" name="ip" value="147.81.84.133"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-grp_pgsql_mirror.meta">
           <nvpair id="ordered.meta.auto-110" name="ordered" value="true"/>
           <nvpair id="collocated.meta.auto-110" name="collocated" value="true"/>
         </meta_attributes>
       </group>
     </resources>
     <constraints>
       <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote" kind="Optional"/>
       <rsc_colocation id="fs_on_drbd_master" rsc="grp_pgsql_mirror" with-rsc="ms_drbd_7788" with-rsc-role="Master" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" shutdown="1178215411" expected="down">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22459">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" transition-key="33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="50a368444c5fd3280a6b039fc46c1f77"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" transition-key="41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" transition-key="38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_start_0" operation="start" transition-key="4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_promote_0" operation="notify" transition-key="60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_promote_0" operation="promote" transition-key="6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_promote_0" operation="notify" transition-key="61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_demote_0" operation="notify" transition-key="57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_demote_0" operation="demote" transition-key="8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_demote_0" operation="notify" transition-key="58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="26" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id23051">
           <nvpair id="nvpair.id23058" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23099">
           <nvpair id="nvpair.id23106" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id23123">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="50a368444c5fd3280a6b039fc46c1f77"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_start_0" operation="start" transition-key="6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="a0c7658413451c848e9fc6b6a312d23a"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_stop_0" operation="notify" transition-key="38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_stop_0" operation="stop" transition-key="6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_promote_0" operation="notify" transition-key="52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_promote_0" operation="notify" transition-key="53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_demote_0" operation="notify" transition-key="49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="19" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_promote_0" operation="promote" transition-key="8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="a0c7658413451c848e9fc6b6a312d23a"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_demote_0" operation="notify" transition-key="50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="ff93d324a350fc0196d60d4da4505d40"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/bug-1573.xml b/cts/scheduler/bug-1573.xml
index 94f8404189..fbad6ed530 100644
--- a/cts/scheduler/bug-1573.xml
+++ b/cts/scheduler/bug-1573.xml
@@ -1,145 +1,144 @@
 <cib admin_epoch="1" epoch="22" num_updates="330" dc-uuid="6a0b1629-ab27-47c7-a6a4-461c94e477f2" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21858" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21895" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21904" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21914" name="stop-orphan-actions" value="true"/>
-        <nvpair id="nvpair.id21932" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair id="nvpair.id21969" name="last-lrm-refresh" value="1179263353"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="50e1f0d4-391f-4d48-a087-98972f612b8b" uname="xen-c" type="member"/>
       <node id="6a0b1629-ab27-47c7-a6a4-461c94e477f2" uname="xen-b" type="member"/>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="15s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <group id="group_1">
         <primitive id="IPaddr_192_168_1_101" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="5s" id="IPaddr_192_168_1_101_mon" timeout="5s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22035">
             <nvpair id="nvpair.id22042" name="ip" value="192.168.1.101"/>
           </instance_attributes>
         </primitive>
         <primitive id="apache_2" class="ocf" provider="heartbeat" type="apache">
           <operations>
             <op name="monitor" interval="120s" id="apache_2_mon" timeout="60s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22078">
             <nvpair id="nvpair.id22084" name="configfile" value="/etc/apache2/apache2.conf"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-group_1.meta"/>
       </group>
       <group id="group_11">
         <primitive id="IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="5s" id="IPaddr_192_168_1_102_mon" timeout="5s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22126">
             <nvpair id="nvpair.id22133" name="ip" value="192.168.1.102"/>
           </instance_attributes>
         </primitive>
         <primitive id="apache_6" class="ocf" provider="heartbeat" type="apache">
           <operations>
             <op name="monitor" interval="120s" id="apache_6_mon" timeout="60s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22168">
             <nvpair id="nvpair.id22175" name="configfile" value="/etc/apache2/apache6.conf"/>
           </instance_attributes>
           <instance_attributes id="instance_attributes.id22186">
             <nvpair id="nvpair.id22192" name="target_role" value="started"/>
           </instance_attributes>
           <meta_attributes id="primitive-apache_6.meta">
             <nvpair id="nvpair.meta.auto-123" name="target-role" value="started"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="group-group_11.meta"/>
       </group>
     </resources>
     <constraints>
       <rsc_location id="rsc_location_group_1" rsc="group_1">
         <rule id="preferred_location_group_1" score="100">
           <expression attribute="#uname" id="expression.id22223" operation="eq" value="xen-b"/>
         </rule>
       </rsc_location>
       <rsc_location id="rsc_location_group_11" rsc="group_11">
         <rule id="preferred_location_group_11" score="100">
           <expression attribute="#uname" id="expression.id22249" operation="eq" value="xen-c"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="50e1f0d4-391f-4d48-a087-98972f612b8b" uname="xen-c" crmd="offline" shutdown="0" in_ccm="false" join="down" ha="dead" expected="down">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22294">
           <lrm_resource id="IPaddr_192_168_1_101" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_192_168_1_101_monitor_0" operation="monitor" transition-key="7:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;7:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="2" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_start_0" operation="start" transition-key="8:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;8:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="7" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_monitor_5000" operation="monitor" transition-key="9:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;9:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="8" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="5000" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_stop_0" operation="stop" transition-key="7:8:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;7:8:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="14" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_192_168_1_102" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_192_168_1_102_monitor_0" operation="monitor" transition-key="9:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;9:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="4" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="105f96828c0a3406ad0dfd513b0d7d89"/>
           </lrm_resource>
           <lrm_resource id="apache_2" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache_2_monitor_0" operation="monitor" transition-key="8:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;8:2:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="3" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_start_0" operation="start" transition-key="11:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;11:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="9" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_monitor_120000" operation="monitor" transition-key="12:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;12:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="10" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="120000" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_stop_0" operation="stop" transition-key="8:8:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;8:8:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="12" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
           </lrm_resource>
           <lrm_resource id="apache_6" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache_6_monitor_0" operation="monitor" transition-key="6:5:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:7;6:5:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="6" crm_feature_set="1.0.8" rc-code="7" op-status="0" interval="0" op-digest="ebd004b8d4d6599c3442470c38f212c3"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-0"/>
     </node_state>
     <node_state id="6a0b1629-ab27-47c7-a6a4-461c94e477f2" uname="xen-b" crmd="online" in_ccm="true" join="member" ha="active" expected="down" shutdown="1179263400">
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22637">
           <nvpair id="nvpair.id22644" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22662">
           <lrm_resource id="IPaddr_192_168_1_101" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_192_168_1_101_monitor_0" operation="monitor" transition-key="3:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;3:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="2" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_start_0" operation="start" transition-key="4:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;4:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="8" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_monitor_5000" operation="monitor" transition-key="5:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;5:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="12" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="5000" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
             <lrm_rsc_op id="IPaddr_192_168_1_101_stop_0" operation="stop" transition-key="7:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;7:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="22" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="8604f7a18ecf196f44e3c0ad4613cd94"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_192_168_1_102" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_192_168_1_102_monitor_0" operation="monitor" transition-key="5:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;5:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="4" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="105f96828c0a3406ad0dfd513b0d7d89"/>
             <lrm_rsc_op id="IPaddr_192_168_1_102_start_0" operation="start" transition-key="13:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;13:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="9" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="105f96828c0a3406ad0dfd513b0d7d89"/>
             <lrm_rsc_op id="IPaddr_192_168_1_102_monitor_5000" operation="monitor" transition-key="14:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;14:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="10" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="5000" op-digest="105f96828c0a3406ad0dfd513b0d7d89"/>
           </lrm_resource>
           <lrm_resource id="apache_2" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache_2_monitor_0" operation="monitor" transition-key="4:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="4:7;4:0:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="3" crm_feature_set="1.0.8" rc-code="7" op-status="4" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_start_0" operation="start" transition-key="6:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;6:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="13" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_monitor_120000" operation="monitor" transition-key="7:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;7:1:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="15" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="120000" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
             <lrm_rsc_op id="apache_2_stop_0" operation="stop" transition-key="10:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:0;10:7:0:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="20" crm_feature_set="1.0.8" rc-code="0" op-status="0" interval="0" op-digest="9f0c90d3ddf56d768fb5756ba84e0042"/>
           </lrm_resource>
           <lrm_resource id="apache_6" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache_6_monitor_0" operation="monitor" transition-key="8:5:7:91d2f8d5-5403-47ed-9113-51276e32a70b" transition-magic="0:7;8:5:7:91d2f8d5-5403-47ed-9113-51276e32a70b" call-id="18" crm_feature_set="1.0.8" rc-code="7" op-status="0" interval="0" op-digest="ebd004b8d4d6599c3442470c38f212c3"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/bug-1685.xml b/cts/scheduler/bug-1685.xml
index f20c62d948..c44827cda3 100644
--- a/cts/scheduler/bug-1685.xml
+++ b/cts/scheduler/bug-1685.xml
@@ -1,115 +1,114 @@
 <cib admin_epoch="0" epoch="13" num_updates="24" dc-uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
-        <nvpair id="nvpair.id21848" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21858" name="startup-fencing" value="true"/>
         <nvpair id="nvpair.id21867" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21876" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21885" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21894" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21913" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21922" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21941" name="probe_complete" value="true"/>
         <nvpair id="nvpair.id21950" name="transition-idle-timeout" value="60s"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" uname="redun2" type="member"/>
       <node id="cd34ed93-fa5d-4092-a618-ac6349351d13" uname="redun1" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="800"/>
       </meta_attributes>
     </rsc_defaults>
     <resources>
       <clone id="shared_storage">
         <meta_attributes id="meta_attributes.id22000">
           <nvpair id="nvpair.id22006" name="promotable" value="true"/>
           <nvpair id="nvpair.id22007" name="promoted-node-max" value="1"/>
           <nvpair id="nvpair.id22016" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22024" name="notify" value="yes"/>
           <nvpair id="nvpair.id22033" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22042" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22050" name="globally-unique" value="false"/>
         </meta_attributes>
         <primitive id="prim_shared_storage" class="ocf" provider="heartbeat" type="drbd">
           <operations>
             <op name="monitor" interval="120s" id="shared_storage_op_monitor" timeout="60s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22087">
             <nvpair id="nvpair.id22094" name="drbd_resource" value="sip-shared"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="clone-shared_storage.meta"/>
       </clone>
       <primitive id="shared_filesystem" class="ocf" provider="heartbeat" type="Filesystem">
         <operations>
           <op name="monitor" interval="120s" id="shared_filesystem_op_monitor" timeout="60s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22132">
           <nvpair id="nvpair.id22138" name="device" value="/dev/drbd0"/>
           <nvpair id="nvpair.id22147" name="directory" value="/shared"/>
           <nvpair id="nvpair.id22156" name="fstype" value="reiserfs"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_colocation id="colocation_shared_filesystem_shared_storage-master" rsc="shared_filesystem" with-rsc="shared_storage" with-rsc-role="Master" score="INFINITY"/>
       <rsc_order id="order_shared_filesystem_after_shared_storage-promote" first="shared_storage" then="shared_filesystem" then-action="start" first-action="promote"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1" uname="redun2" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22233">
           <lrm_resource id="prim_shared_storage:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="prim_shared_storage-0_monitor_0" operation="monitor" transition-key="3:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;3:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="2" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
             <lrm_rsc_op id="prim_shared_storage-0_start_0" operation="start" transition-key="4:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:0;4:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="5" crm_feature_set="1.0.9" rc-code="0" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
             <lrm_rsc_op id="prim_shared_storage-0_post_notify_start_0" operation="notify" transition-key="39:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:0;39:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="6" crm_feature_set="1.0.9" rc-code="0" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
           </lrm_resource>
           <lrm_resource id="shared_filesystem" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="shared_filesystem_monitor_0" operation="monitor" transition-key="4:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;4:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="3" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="5858fd8b1fcc9107c71c24186f95f937"/>
           </lrm_resource>
           <lrm_resource id="prim_shared_storage:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="prim_shared_storage-1_monitor_0" operation="monitor" transition-key="3:1:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;3:1:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="4" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22414">
           <nvpair id="nvpair.id22421" name="probe_complete" value="true"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22432">
           <nvpair id="nvpair.id22439" name="master-prim_shared_storage:0" value="75"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="cd34ed93-fa5d-4092-a618-ac6349351d13" uname="redun1" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <lrm_resources id="lrm_resources.id22480">
           <lrm_resource id="prim_shared_storage:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="prim_shared_storage-0_monitor_0" operation="monitor" transition-key="6:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;6:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="2" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
           </lrm_resource>
           <lrm_resource id="shared_filesystem" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="shared_filesystem_monitor_0" operation="monitor" transition-key="7:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;7:0:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="3" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="5858fd8b1fcc9107c71c24186f95f937"/>
           </lrm_resource>
           <lrm_resource id="prim_shared_storage:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="prim_shared_storage-1_monitor_0" operation="monitor" transition-key="5:1:7:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:7;5:1:7:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="4" crm_feature_set="1.0.9" rc-code="7" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
             <lrm_rsc_op id="prim_shared_storage-1_start_0" operation="start" transition-key="6:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:0;6:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="5" crm_feature_set="1.0.9" rc-code="0" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
             <lrm_rsc_op id="prim_shared_storage-1_post_notify_start_0" operation="notify" transition-key="42:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" transition-magic="0:0;42:2:0:65315fa6-aeaf-48f4-88b1-441ca298582a" call-id="6" crm_feature_set="1.0.9" rc-code="0" op-status="0" interval="0" op-digest="f05e197b6b37f94c2a3977cc41e66556"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <instance_attributes id="instance_attributes.id22657">
           <nvpair id="nvpair.id22664" name="probe_complete" value="true"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22676">
           <nvpair id="nvpair.id22683" name="master-prim_shared_storage:1" value="75"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/bug-1822.xml b/cts/scheduler/bug-1822.xml
index ab6c5314b2..60981e1661 100644
--- a/cts/scheduler/bug-1822.xml
+++ b/cts/scheduler/bug-1822.xml
@@ -1,170 +1,169 @@
 <cib admin_epoch="0" epoch="68" num_updates="74" dc-uuid="e38f935d-6059-4540-8679-bc32a8256839" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="set01">
         <nvpair id="nvpair.id21867" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21875" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21884" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id21901" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21910" name="symmetric-cluster" value="true"/>
-        <nvpair id="nvpair.id21920" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21938" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21947" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21965" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21973" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id21982" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id21991" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id22000" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22009" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22018" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22027" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22036" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22045" name="startup-fencing" value="true"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair name="last-lrm-refresh" id="nvpair.id22062" value="1189560161"/>
         <nvpair name="dc-version" id="nvpair.id22071" value="2.1.3-node: 09a2043b4cd2682f88dd1a81dc32a6d1d1870f06"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="nvpair.id218777">
         <nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" type="member"/>
       <node id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" type="member"/>
     </nodes>
     <resources>
       <clone id="ms-sf">
         <group id="ms-sf_group">
           <primitive id="master_slave_Stateful" class="ocf" type="Dummy-statful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="stateful_start" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="600s" id="stateful_monitor" timeout="60s" on-fail="stop"/>
               <op name="stop" interval="0" id="stateful_stop" timeout="60s" on-fail="stop"/>
             </operations>
             <instance_attributes id="instance_attributes.id22215">
               <nvpair id="nvpair.id22222" name="sleep_time" value="10000"/>
             </instance_attributes>
           </primitive>
           <primitive id="master_slave_procdctl" class="ocf" type="procdctl" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="ctl_start" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="600s" id="ctl_monitor" timeout="60s" on-fail="stop"/>
               <op name="stop" interval="0" id="ctl_stop" timeout="60s" on-fail="stop"/>
             </operations>
             <instance_attributes id="instance_attributes.id22281">
               <nvpair id="nvpair.id22288" name="procd" value="sleep 10000"/>
             </instance_attributes>
           </primitive>
           <meta_attributes id="group-ms-sf_group.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="promotable.meta.auto-79" name="promotable" value="true"/>
           <nvpair id="ordered.meta.auto-79" name="ordered" value="false"/>
           <nvpair id="interleave.meta.auto-79" name="interleave" value="false"/>
           <nvpair id="notify.meta.auto-79" name="notify" value="false"/>
           <nvpair id="nvpair.meta.auto-85" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-87" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-89" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-91" name="promoted-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc-ms-sf" rsc="ms-sf">
         <rule id="rule-ms-sf-0" role="Master" score="100">
           <expression attribute="#uname" operation="eq" value="process1a" id="expression.id22321"/>
         </rule>
         <rule id="rule-ms-sf-1" role="Master" score="50">
           <expression attribute="#uname" operation="eq" value="process2b" id="expression.id22340"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" crmd="online" shutdown="1200361857" in_ccm="true" join="member" ha="active" expected="down">
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22381">
           <nvpair id="nvpair.id22388" name="default_ping_set" value="100"/>
           <nvpair id="nvpair.id22397" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id22407" name="fail-count-master_slave_procdctl:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22425">
           <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;4:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;7:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_promote_0" operation="promote" transition-key="14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_demote_0" operation="demote" transition-key="23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;2:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
           <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;3:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;5:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_promote_0" operation="promote" transition-key="10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:2:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_demote_0" operation="demote" transition-key="19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;19:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;20:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
           <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;6:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-1_promote_0" operation="promote" transition-key="13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;13:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
           <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;5:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;11:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-1_promote_0" operation="promote" transition-key="12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;12:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" crmd="online" in_ccm="true" join="member" ha="active" expected="member" shutdown="0">
       <transient_attributes id="e38f935d-6059-4540-8679-bc32a8256839">
         <instance_attributes id="instance_attributes.id22931">
           <nvpair id="nvpair.id22938" name="default_ping_set" value="100"/>
           <nvpair id="nvpair.id22947" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id22957" name="fail-count-master_slave_procdctl:1" value="1"/>
           <nvpair id="nvpair.id22966" name="fail-count-master_slave_procdctl:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="e38f935d-6059-4540-8679-bc32a8256839">
         <lrm_resources id="lrm_resources.id22984">
           <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;8:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;22:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_600000" operation="monitor" transition-key="1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;1:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="600000" op-digest="58c3e9fea8672fc540116121073095bc"/>
           </lrm_resource>
           <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;10:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
             <lrm_rsc_op id="master_slave_Stateful-1_stop_0" operation="stop" transition-key="10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
           </lrm_resource>
           <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;9:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;24:6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
           <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;11:0:7:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;15:1:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
             <lrm_rsc_op id="master_slave_procdctl-1_stop_0" operation="stop" transition-key="4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/clone-anon-dup.xml b/cts/scheduler/clone-anon-dup.xml
index 4405a57d01..bcc844f41d 100644
--- a/cts/scheduler/clone-anon-dup.xml
+++ b/cts/scheduler/clone-anon-dup.xml
@@ -1,202 +1,201 @@
 <cib admin_epoch="0" epoch="122" have-quorum="1" remote-tls-port="0" validate-with="pacemaker-3.0" crm_feature_set="3.0.1" num_updates="103" cib-last-written="Fri Jul 13 13:51:03 2012" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
   <configuration>
     <crm_config>
       <cluster_property_set id="default">
         <nvpair id="symmetric-cluster" name="symmetric-cluster" value="true"/>
         <nvpair id="transition-idle-timeout" name="transition-idle-timeout" value="60"/>
-        <nvpair id="short-resource-names" name="short-resource-names" value="true"/>
         <nvpair id="no-quorum-policy" name="no-quorum-policy" value="stop"/>
         <nvpair id="stop-orphan-resources" name="stop-orphan-resources" value="false"/>
         <nvpair id="stop-orphan-actions" name="stop-orphan-actions" value="true"/>
         <nvpair id="stonith-enabled" name="stonith-enabled" value="true"/>
         <nvpair id="stonith-action" name="stonith-action" value="reboot"/>
         <!-- see /usr/lib/heartbeat/crmd metadata - set to defaults -->
         <nvpair id="dc-deadtime" name="dc-deadtime" value="10s"/>
         <!-- cluster-recheck-interval is also needed for failure-timeout stuff -->
         <nvpair id="cluster-recheck-interval" name="cluster-recheck-interval" value="15min"/>
         <nvpair id="election-timeout" name="election-timeout" value="30s"/>
         <nvpair id="shutdown-escalation" name="shutdown-escalation" value="20min"/>
         <nvpair id="crmd-integration-timeout" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="crmd-finalization-timeout" name="crmd-finalization-timeout" value="30min"/>
         <!-- even more options - set to defaults -->
         <nvpair id="stonith-timeout" name="stonith-timeout" value="60s"/>
         <nvpair id="startup-fencing" name="startup-fencing" value="true"/>
         <nvpair id="maintenance-mode" name="maintenance-mode" value="false"/>
         <nvpair id="cluster-delay" name="cluster-delay" value="60s"/>
         <nvpair id="batch-limit" name="batch-limit" value="30"/>
         <nvpair id="stop-all-resources" name="stop-all-resources" value="false"/>
         <nvpair id="pe-error-series-max" name="pe-error-series-max" value="-1"/>
         <nvpair id="pe-warn-series-max" name="pe-warn-series-max" value="-1"/>
         <nvpair id="pe-input-series-max" name="pe-input-series-max" value="-1"/>
         <nvpair id="start-failure-is-fatal" name="start-failure-is-fatal" value="true"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.1-node: f228d820ba27cc33ea5778224d8d2084119b588c"/>
         <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1235750291"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node uname="wc01" id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" type="member">
         <instance_attributes id="node_1_ia">
           <nvpair id="node_1_cluster_group" name="cluster_group" value="web"/>
         </instance_attributes>
         <instance_attributes id="nodes-31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
           <nvpair id="standby-31de4ab3-2d05-476e-8f9a-627ad6cd94ca" name="standby" value="off"/>
         </instance_attributes>
       </node>
       <node uname="wc02" id="f36760d8-d84a-46b2-b452-4c8cac8b3396" type="member">
         <instance_attributes id="node_2_ia">
           <nvpair id="node_2_cluster_group" name="cluster_group" value="web"/>
         </instance_attributes>
         <instance_attributes id="nodes-f36760d8-d84a-46b2-b452-4c8cac8b3396">
           <nvpair id="standby-f36760d8-d84a-46b2-b452-4c8cac8b3396" name="standby" value="off"/>
         </instance_attributes>
       </node>
       <node id="f61edb1d-6f49-4ffa-a46a-42ceef796f6e" uname="wc03" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="1"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="20s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <!-- webservices - START -->
       <clone id="clone_webservice">
         <meta_attributes id="clone_webservice_ma">
           <nvpair id="clone_webservice_interleave" name="interleave" value="true"/>
           <nvpair id="clone_webservice_role" name="target-role" value="Started"/>
           <nvpair id="clone_webservice_globally-unique" name="globally-unique" value="false"/>
           <nvpair id="clone_webservice_migration-threshhold" name="migration-threshold" value="10"/>
           <nvpair id="clone_webservice_failure-timeout" name="failure-timeout" value="30s"/>
         </meta_attributes>
         <instance_attributes id="clone_webservice_ia">
           <nvpair id="clone_webservice_max" name="clone-max" value="2"/>
           <nvpair id="clone_webservice_node_max" name="clone-node-max" value="1"/>
         </instance_attributes>
         <meta_attributes id="clone_webservice_ma2">
           <nvpair id="meta-clone_webservice_max" name="clone-max" value="2"/>
           <nvpair id="meta-clone_webservice_node_max" name="clone-node-max" value="1"/>
         </meta_attributes>
         <group id="group_webservice">
           <!-- fs www data - START -->
           <primitive class="ocf" id="fs_www" provider="heartbeat" type="Filesystem">
             <operations>
               <op id="fs_www_mon" interval="30s" name="monitor" timeout="30s"/>
             </operations>
             <instance_attributes id="fs_www_ia">
               <nvpair id="fs_www_attr_0" name="device" value="wcnfs:/share/drbd_www/data/"/>
               <nvpair id="fs_www_attr_1" name="directory" value="/data/www"/>
               <nvpair id="fs_www_attr_2" name="fstype" value="nfs"/>
             </instance_attributes>
           </primitive>
           <!-- fs www data - STOP -->
           <!-- apache2 - START -->
           <primitive id="apache2" class="ocf" type="apache" provider="heartbeat">
             <meta_attributes id="apache2_ma">
               <nvpair id="apache2_role" name="target-role" value="Started"/>
             </meta_attributes>
             <operations>
               <op id="apache2_mon" name="monitor" interval="60s" timeout="300s"/>
             </operations>
             <instance_attributes id="apache2_ia">
               <nvpair id="apache2_httpd" name="httpd" value="/usr/sbin/apache2"/>
               <nvpair id="apache2_httpd_options" name="options" value="-k start"/>
               <nvpair id="apache2_httpd_conf" name="configfile" value="/etc/apache2/apache2.conf"/>
               <nvpair id="apache2_httpd_statusurl" name="statusurl" value="http://localhost/server-status/"/>
               <nvpair id="apache2_envfiles" name="envfiles" value="/etc/apache2/envvars"/>
             </instance_attributes>
           </primitive>
           <!-- apache2 - STOP -->
         </group>
       </clone>
       <!-- webservices - STOP -->
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="f36760d8-d84a-46b2-b452-4c8cac8b3396" uname="wc02" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <instance_attributes id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396">
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-pingd" name="pingd" value="100"/>
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-fail-count-stonith_rackpdu:0" name="fail-count-stonith_rackpdu:0" value="1000000"/>
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-last-failure-stonith_rackpdu:0" name="last-failure-stonith_rackpdu:0" value="1235174838"/>
           <nvpair id="status-master-drbd_www:1-f36760d8-d84a-46b2-b452-4c8cac8b3396" name="master-drbd_www:1" value="75"/>
           <nvpair id="status-master-drbd_mysql:1-f36760d8-d84a-46b2-b452-4c8cac8b3396" name="master-drbd_mysql:1" value="75"/>
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-last-failure-apache2:0" name="last-failure-apache2:0" value="1235670173"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <lrm_resources>
           <lrm_resource id="fs_www:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="46:920:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:7;46:920:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="700" rc-code="7" op-status="0" interval="0" last-run="1235638100" last-rc-change="1235638100" exec-time="80" queue-time="2010" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="119:971:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;119:971:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="754" rc-code="0" op-status="0" interval="0" last-run="1235668368" last-rc-change="1235668368" exec-time="100" queue-time="0" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:0_stop_0" operation="stop" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="137:979:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;137:979:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="769" rc-code="0" op-status="0" interval="0" last-run="1235672585" last-rc-change="1235672585" exec-time="110" queue-time="0" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
           </lrm_resource>
           <lrm_resource id="fs_www:1" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="137:970:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;137:970:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="740" rc-code="0" op-status="0" interval="0" last-run="1235668352" last-rc-change="1235668352" exec-time="70" queue-time="0" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="142:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;142:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="782" rc-code="0" op-status="0" interval="0" last-run="1235672601" last-rc-change="1235672601" exec-time="80" queue-time="0" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:1_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="143:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;143:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="783" rc-code="0" op-status="0" interval="30000" last-run="1235750208" last-rc-change="1235672597" exec-time="40" queue-time="0" op-digest="95c1c657e7b6f1f72b0e77e4298b0523"/>
           </lrm_resource>
           <lrm_resource id="apache2:1" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="150:969:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;150:969:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="736" rc-code="0" op-status="0" interval="0" last-run="1235668349" last-rc-change="1235668349" exec-time="1080" queue-time="0" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
             <lrm_rsc_op id="apache2:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="144:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;144:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="784" rc-code="0" op-status="0" interval="0" last-run="1235672602" last-rc-change="1235672602" exec-time="1390" queue-time="0" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
             <lrm_rsc_op id="apache2:1_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="145:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;145:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="785" rc-code="0" op-status="0" interval="60000" last-run="1235750191" last-rc-change="1235672598" exec-time="50" queue-time="0" op-digest="98f86a21dd05a964aad55a249c7cc09b"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="29:1073:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;29:1073:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="788" rc-code="0" op-status="0" interval="0" last-run="1235750358" last-rc-change="1235750358" exec-time="60" queue-time="0" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" uname="wc01" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <instance_attributes id="status-31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
           <nvpair id="status-31de4ab3-2d05-476e-8f9a-627ad6cd94ca-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-master-drbd_mysql:0-31de4ab3-2d05-476e-8f9a-627ad6cd94ca" name="master-drbd_mysql:0" value="75"/>
           <nvpair id="status-31de4ab3-2d05-476e-8f9a-627ad6cd94ca-pingd" name="pingd" value="100"/>
           <nvpair id="status-master-drbd_www:0-31de4ab3-2d05-476e-8f9a-627ad6cd94ca" name="master-drbd_www:0" value="75"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <lrm_resources>
           <lrm_resource id="fs_www:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="30:977:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:7;30:977:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1235671061" last-rc-change="1235671061" exec-time="130" queue-time="2020" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="134:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;134:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="41" rc-code="0" op-status="0" interval="0" last-run="1235672601" last-rc-change="1235672601" exec-time="160" queue-time="0" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
             <lrm_rsc_op id="fs_www:0_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="135:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;135:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="42" rc-code="0" op-status="0" interval="30000" last-run="1235750210" last-rc-change="1235672598" exec-time="50" queue-time="0" op-digest="95c1c657e7b6f1f72b0e77e4298b0523"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="27:1166:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;27:1166:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="149" rc-code="0" op-status="0" interval="0" last-run="1235750459" last-rc-change="1235750459" exec-time="130" queue-time="0" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
             <lrm_rsc_op id="apache2:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="136:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;136:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="43" rc-code="0" op-status="0" interval="0" last-run="1235672602" last-rc-change="1235672602" exec-time="1370" queue-time="0" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
             <lrm_rsc_op id="apache2:0_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="137:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:0;137:982:0:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="44" rc-code="0" op-status="0" interval="60000" last-run="1235750183" last-rc-change="1235672600" exec-time="90" queue-time="0" op-digest="98f86a21dd05a964aad55a249c7cc09b"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="f61edb1d-6f49-4ffa-a46a-42ceef796f6e" uname="wc03" ha="active" join="member" crm-debug-origin="do_update_resource" in_ccm="true" crmd="online" shutdown="0" expected="member">
       <lrm id="f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
         <lrm_resources>
           <lrm_resource id="fs_www:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="40:1070:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:7;40:1070:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1235750231" last-rc-change="1235750231" exec-time="260" queue-time="2040" op-digest="f4d525ad8ad6b437e3226d42513b0709"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="41:1070:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" transition-magic="0:7;41:1070:7:9d674f02-fd06-46e7-9a25-a1bd4c4f1692" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1235750231" last-rc-change="1235750231" exec-time="260" queue-time="2040" op-digest="a8cca513cbe9739669efd1ab9d1d3077"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
         <instance_attributes id="status-f61edb1d-6f49-4ffa-a46a-42ceef796f6e">
           <nvpair id="status-f61edb1d-6f49-4ffa-a46a-42ceef796f6e-probe_complete" name="probe_complete" value="true"/>
           <nvpair id="status-f61edb1d-6f49-4ffa-a46a-42ceef796f6e-last-failure-mysql-server" name="last-failure-mysql-server" value="1235750234"/>
           <nvpair id="status-f61edb1d-6f49-4ffa-a46a-42ceef796f6e-pingd" name="pingd" value="100"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/cloned-group.xml b/cts/scheduler/cloned-group.xml
index 4ad75dbde9..bd01a84585 100644
--- a/cts/scheduler/cloned-group.xml
+++ b/cts/scheduler/cloned-group.xml
@@ -1,85 +1,84 @@
 <cib admin_epoch="0" epoch="300" num_updates="42019" dc-uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:04 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="default">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21858" name="transition-idle-timeout" value="60"/>
-        <nvpair id="nvpair.id21876" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21885" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21894" name="stop-orphan-resources" value="false"/>
         <nvpair id="nvpair.id21903" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21930" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21939" name="stonith-action" value="reboot"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" type="member"/>
       <node id="989edcb8-aa41-4aab-9fca-65569015499d" uname="webcluster02" type="member"/>
     </nodes>
     <resources>
       <clone id="apache2_clone">
         <group id="grrr">
           <primitive id="apache2" class="ocf" type="apache" provider="heartbeat">
             <operations>
               <op name="monitor" interval="10s" id="apache2_mon" timeout="20s"/>
             </operations>
             <instance_attributes id="instance_attributes.id22044">
               <nvpair id="nvpair.id22051" name="httpd" value="/usr/sbin/apache2"/>
               <nvpair id="nvpair.id22060" name="options" value="-k start"/>
               <nvpair id="nvpair.id22069" name="configfile" value="/etc/apache2/apache2.conf"/>
               <nvpair id="nvpair.id22078" name="target_role" value="started"/>
             </instance_attributes>
             <meta_attributes id="primitive-apache2.meta">
               <nvpair id="nvpair.meta.auto-78" name="target-role" value="started"/>
             </meta_attributes>
           </primitive>
           <primitive id="mysql-proxy" class="lsb" type="mysql-proxy">
             <operations>
               <op name="monitor" interval="10s" id="mysql-proxy_mon" timeout="20s"/>
             </operations>
           </primitive>
           <meta_attributes id="group-grrr.meta"/>
         </group>
         <meta_attributes id="clone-apache2_clone.meta">
           <nvpair id="nvpair.meta.auto-55" name="target-role" value="started"/>
           <nvpair id="nvpair.meta.auto-51" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-53" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22152">
           <lrm_resource id="mysql-proxy:1" type="mysql-proxy" class="lsb">
             <lrm_rsc_op id="mysql-proxy-1_monitor_0" operation="monitor" transition-key="6:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:7;6:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="mysql-proxy-1_start_0" operation="start" transition-key="15:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;15:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="mysql-proxy-1_monitor_10000" operation="monitor" transition-key="16:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;16:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="5811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="mysql-proxy:0" type="mysql-proxy" class="lsb">
             <lrm_rsc_op id="mysql-proxy-0_monitor_0" operation="monitor" transition-key="4:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:7;4:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="mysql-proxy-0_start_0" operation="start" transition-key="6:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;6:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="mysql-proxy-0_monitor_10000" operation="monitor" transition-key="7:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;7:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="5811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
           <lrm_resource id="apache2:1" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2-1_monitor_0" operation="monitor" transition-key="5:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:7;5:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="6f4f9083db544b5d5d246a882975fb04"/>
             <lrm_rsc_op id="apache2-1_start_0" operation="start" transition-key="13:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;13:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5f4f9083db544b5d5d246a882975fb04"/>
             <lrm_rsc_op id="apache2-1_monitor_10000" operation="monitor" transition-key="14:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;14:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="5fd4bafc12dc00bd492080cc8f450fcf"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2-0_monitor_0" operation="monitor" transition-key="3:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:7;3:0:7:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="6f4f9083db544b5d5d246a882975fb04"/>
             <lrm_rsc_op id="apache2-0_start_0" operation="start" transition-key="4:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;4:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5f4f9083db544b5d5d246a882975fb04"/>
             <lrm_rsc_op id="apache2-0_monitor_10000" operation="monitor" transition-key="5:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" transition-magic="0:0;5:1:0:9b0d1af2-f932-497b-971f-70be4a277e3d" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="5fd4bafc12dc00bd492080cc8f450fcf"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22525">
           <nvpair id="nvpair.id22532" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/coloc-slave-anti.xml b/cts/scheduler/coloc-slave-anti.xml
index 08fef618dc..8fcabe96df 100644
--- a/cts/scheduler/coloc-slave-anti.xml
+++ b/cts/scheduler/coloc-slave-anti.xml
@@ -1,292 +1,291 @@
 <cib crm_feature_set="2.1" admin_epoch="1" epoch="4" num_updates="53" dc-uuid="f10a448b-abcb-4743-a7b9-cbb966b46462" have-quorum="1" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:04 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21847" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21856" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21883" name="stonith-enabled" value="true"/>
         <nvpair id="nvpair.id21892" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21900" name="startup-fencing" value="true"/>
         <nvpair id="nvpair.id21909" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21918" name="stop-orphan-actions" value="true"/>
-        <nvpair id="nvpair.id21936" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21945" name="transition-idle-timeout" value="5min"/>
         <nvpair id="nvpair.id21972" name="cluster-delay" value="60s"/>
         <nvpair id="nvpair.id21980" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id21989" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id21998" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22007" name="dc-version" value="0.6.2-node: 7f22385d1b41c36c4cc54f292e55869caa94ab7e"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="f10a448b-abcb-4743-a7b9-cbb966b46462" uname="sirius" type="member"/>
       <node id="26cfbecf-dc25-42e1-84de-325ca9e457b5" uname="pollux" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="200"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="20s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <clone id="pingd-clone">
         <meta_attributes id="meta_attributes.id22048">
           <nvpair id="nvpair.id22054" name="globally-unique" value="false"/>
         </meta_attributes>
         <primitive id="pingd-1" class="ocf" provider="heartbeat" type="pingd">
           <instance_attributes id="instance_attributes.id22076">
             <nvpair id="nvpair.id22083" name="pidfile" value="/var/run/heartbeat/rsctmp/pingd-1.pid"/>
             <nvpair id="nvpair.id22092" name="name" value="pingd-1-node-attribute"/>
             <nvpair id="nvpair.id22101" name="dampen" value="5s"/>
             <nvpair id="nvpair.id22109" name="multiplier" value="100"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="10s" id="pingd-1-monitor" timeout="5s"/>
             <op name="start" interval="0" id="pingd-1-start" timeout="10s"/>
           </operations>
           <meta_attributes id="pingd-1-meta_attributes-requires">
             <nvpair id="pingd-1-nvpair-requires" name="requires" value="nothing"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="clone-pingd-clone.meta"/>
       </clone>
       <clone id="drbd-msr">
         <meta_attributes id="meta_attributes.id22156">
           <nvpair id="nvpair.id22161" name="promotable" value="true"/>
           <nvpair id="nvpair.id22162" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22170" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22178" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22187" name="promoted-node-max" value="1"/>
           <nvpair id="nvpair.id22195" name="notify" value="yes"/>
           <nvpair id="nvpair.id22204" name="globally-unique" value="false"/>
         </meta_attributes>
         <primitive id="drbd-r0" class="ocf" provider="heartbeat" type="drbd">
           <instance_attributes id="instance_attributes.id22225">
             <nvpair id="nvpair.id22231" name="drbd_resource" value="r0"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="20s" id="drbd-r0-monitor-1" timeout="10s" role="Master" start-delay="10s"/>
             <op name="monitor" interval="21s" id="drbd-r0-monitor-2" timeout="10s" role="Slave" start-delay="10s"/>
             <op name="start" interval="0" id="drbd-r0-start-1" timeout="10s" role="Master"/>
             <op name="start" interval="0" id="drbd-r0-start-2" timeout="10s" role="Slave"/>
             <op name="stop" interval="0" id="drbd-r0-stop-1" timeout="10s" role="Master"/>
             <op name="stop" interval="0" id="drbd-r0-stop-2" timeout="10s" role="Slave"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-drbd-msr.meta">
           <nvpair id="ordered.meta.auto-96" name="ordered" value="false"/>
         </meta_attributes>
       </clone>
       <group id="group-1">
         <primitive id="fs-1" class="ocf" provider="heartbeat" type="Filesystem">
           <instance_attributes id="instance_attributes.id22332">
             <nvpair id="nvpair.id22338" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22347" name="directory" value="/drbd"/>
             <nvpair id="nvpair.id22356" name="fstype" value="xfs"/>
             <nvpair id="nvpair.id22364" name="options" value="noatime,exec,nosuid,nodev"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="20s" id="fs-1-monitor" timeout="10s" start-delay="10s"/>
             <op name="start" interval="0" id="fs-1-start" timeout="10s"/>
             <op name="stop" interval="0" id="fs-1-stop" timeout="10s"/>
           </operations>
         </primitive>
         <primitive id="ip-198" class="ocf" provider="heartbeat" type="IPaddr2">
           <instance_attributes id="instance_attributes.id22418">
             <nvpair id="nvpair.id22425" name="ip" value="80.237.189.198"/>
             <nvpair id="nvpair.id22433" name="cidr_netmask" value="28"/>
             <nvpair id="nvpair.id22441" name="nic" value="eth1"/>
             <nvpair id="nvpair.id22450" name="iflabel" value="198"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="30s" id="ip-198-monitor" timeout="15s" start-delay="10s"/>
             <op name="start" interval="0" id="ip-198-start" timeout="10s"/>
             <op name="stop" interval="0" id="ip-198-stop" timeout="10s"/>
           </operations>
         </primitive>
         <primitive id="apache" class="ocf" provider="custom" type="apache2">
           <instance_attributes id="instance_attributes.id22503">
             <nvpair id="nvpair.id22510" name="apache2_bin" value="/usr/sbin/apache2"/>
             <nvpair id="nvpair.id22518" name="apache2_pidfile" value="/var/run/apache2.pid"/>
             <nvpair id="nvpair.id22527" name="apache2_config" value="/etc/apache2/httpd.conf"/>
             <nvpair id="nvpair.id22536" name="apache2_opts" value="-D STATUS -D INFO -D LANGUAGE -D SSL -D SUEXEC -D PHP5"/>
             <nvpair id="nvpair.id22545" name="apache2_listening_check" value="80.237.189.198:80"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="60s" id="apache-monitor" timeout="30s" start-delay="10s"/>
             <op name="start" interval="0" id="apache-start" timeout="30s"/>
             <op name="stop" interval="0" id="apache-stop" timeout="30s"/>
           </operations>
         </primitive>
         <meta_attributes id="group-group-1.meta"/>
       </group>
       <primitive id="pollux-fencing" class="stonith" type="external/ipmi-soft">
         <instance_attributes id="instance_attributes.id22604">
           <nvpair id="nvpair.id22610" name="hostname" value="pollux"/>
           <nvpair id="nvpair.id22619" name="ipaddr" value="10.0.0.195"/>
           <nvpair id="nvpair.id22628" name="userid" value="root"/>
           <nvpair id="nvpair.id22637" name="passwd" value="qwe123"/>
         </instance_attributes>
         <operations>
           <op name="monitor" interval="60s" id="pollux-fencing-monitor" timeout="10s"/>
           <op name="start" interval="0" id="pollux-fencing-start" timeout="10s"/>
           <op name="stop" interval="0" id="pollux-fencing-stop" timeout="10s"/>
         </operations>
         <meta_attributes id="primitive-pollux-fencing.meta">
           <nvpair id="resource_stickiness.meta.auto-226" name="resource-stickiness" value="INFINITY"/>
           <nvpair id="pollux-fencing-nvpair-requires" name="requires" value="nothing"/>
         </meta_attributes>
       </primitive>
       <primitive id="sirius-fencing" class="stonith" type="external/ipmi-soft">
         <instance_attributes id="instance_attributes.id22699">
           <nvpair id="nvpair.id22706" name="hostname" value="sirius"/>
           <nvpair id="nvpair.id22714" name="ipaddr" value="10.0.0.197"/>
           <nvpair id="nvpair.id22723" name="userid" value="root"/>
           <nvpair id="nvpair.id22732" name="passwd" value="qwe123"/>
         </instance_attributes>
         <operations>
           <op name="monitor" interval="60s" id="sirius-fencing-monitor" timeout="10s"/>
           <op name="start" interval="0" id="sirius-fencing-start" timeout="10s"/>
           <op name="stop" interval="0" id="sirius-fencing-stop" timeout="10s"/>
         </operations>
         <meta_attributes id="primitive-sirius-fencing.meta">
           <nvpair id="resource_stickiness.meta.auto-252" name="resource-stickiness" value="INFINITY"/>
           <nvpair id="sirius-fencing-nvpair-requires" name="requires" value="nothing"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="rsc-location-drbd-msr" rsc="drbd-msr">
         <rule id="preferred-location-drbd-msr" role="Master" score="50">
           <expression id="expression.id22801" attribute="#uname" operation="eq" value="pollux"/>
         </rule>
         <rule id="pingd-score-group-1" role="Master" score-attribute="pingd-1-node-attribute">
           <expression id="expression.id22822" attribute="pingd-1-node-attribute" operation="defined"/>
         </rule>
       </rsc_location>
       <rsc_colocation id="group-1-prefer-on-drbd-msr-master" rsc="group-1" with-rsc="drbd-msr" with-rsc-role="Master" score="INFINITY"/>
       <rsc_colocation id="group-1-never-on-drbd-msr-slave" rsc="group-1" with-rsc="drbd-msr" with-rsc-role="Slave" score="-INFINITY"/>
       <rsc_order id="group-1-after-drbd-msr" first="drbd-msr" then="group-1" then-action="start" first-action="promote"/>
       <rsc_location id="pollux-fencing-placement" rsc="pollux-fencing">
         <rule id="pollux-fencing-placement-1" score="INFINITY">
           <expression id="expression.id22883" attribute="#uname" operation="ne" value="pollux"/>
         </rule>
         <rule id="pollux-fencing-placement-2" score="-INFINITY">
           <expression id="expression.id22901" attribute="#uname" operation="eq" value="pollux"/>
         </rule>
       </rsc_location>
       <rsc_location id="sirius-fencing-placement" rsc="sirius-fencing">
         <rule id="sirius-fencing-placement-1" score="INFINITY">
           <expression id="expression.id22928" attribute="#uname" operation="ne" value="sirius"/>
         </rule>
         <rule id="sirius-fencing-placement-2" score="-INFINITY">
           <expression id="expression.id22946" attribute="#uname" operation="eq" value="sirius"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="26cfbecf-dc25-42e1-84de-325ca9e457b5" uname="pollux" crmd="online" shutdown="0" ha="active" in_ccm="true" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22989">
           <lrm_resource id="pingd-1:0" type="pingd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pingd-1-0_monitor_0" operation="monitor" transition-key="11:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;11:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="2" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
           </lrm_resource>
           <lrm_resource id="ip-198" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-198_monitor_0" operation="monitor" transition-key="14:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;14:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="5" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="db4fe2112c192dcdba6b8c9c8f1dbc05"/>
           </lrm_resource>
           <lrm_resource id="fs-1" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs-1_monitor_0" operation="monitor" transition-key="13:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;13:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="4" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="b2b85e9ade4ce3ea16a1ecfac36761b8"/>
           </lrm_resource>
           <lrm_resource id="drbd-r0:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd-r0-0_monitor_0" operation="monitor" transition-key="12:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;12:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="3" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
           </lrm_resource>
           <lrm_resource id="pollux-fencing" type="external/ipmi-soft" class="stonith">
             <lrm_rsc_op id="pollux-fencing_monitor_0" operation="monitor" transition-key="16:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;16:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="7" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="6a0dd162758f62bc52df4fcfba007119"/>
           </lrm_resource>
           <lrm_resource id="apache" type="apache2" class="ocf" provider="custom">
             <lrm_rsc_op id="apache_monitor_0" operation="monitor" transition-key="15:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;15:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="6" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="93b018a79565fe7ba531dc520eee7853"/>
           </lrm_resource>
           <lrm_resource id="sirius-fencing" type="external/ipmi-soft" class="stonith">
             <lrm_rsc_op id="sirius-fencing_monitor_0" operation="monitor" transition-key="17:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;17:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="8" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="369dee444ee042bc029156a34392614f"/>
             <lrm_rsc_op id="sirius-fencing_start_0" operation="start" transition-key="52:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;52:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="11" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="369dee444ee042bc029156a34392614f"/>
             <lrm_rsc_op id="sirius-fencing_monitor_60000" operation="monitor" transition-key="51:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;51:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="12" crm_feature_set="2.1" rc-code="0" op-status="0" interval="60000" op-digest="13e13655085b688aecb96b00c866ae9c"/>
           </lrm_resource>
           <lrm_resource id="pingd-1:1" type="pingd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pingd-1-1_monitor_0" operation="monitor" transition-key="6:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;6:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="9" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
             <lrm_rsc_op id="pingd-1-1_start_0" operation="start" transition-key="8:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;8:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="13" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
             <lrm_rsc_op id="pingd-1-1_monitor_10000" operation="monitor" transition-key="9:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;9:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="15" crm_feature_set="2.1" rc-code="0" op-status="0" interval="10000" op-digest="4f164d8c8a42d67dd673599dc4c7e9c8"/>
           </lrm_resource>
           <lrm_resource id="drbd-r0:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd-r0-1_monitor_0" operation="monitor" transition-key="7:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;7:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="10" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_start_0" operation="start" transition-key="14:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;14:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="14" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_post_notify_start_0" operation="notify" transition-key="66:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;66:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="16" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_promote_0" operation="promote" transition-key="20:3:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;20:3:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="18" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_monitor_20000" operation="monitor" transition-key="21:3:8:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:8;21:3:8:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="20" crm_feature_set="2.1" rc-code="8" op-status="0" interval="20000" op-digest="2f5bfc102c25723a9071395b38755293"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id23607">
           <nvpair id="nvpair.id23614" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id23623" name="pingd-1-node-attribute" value="300"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id23635">
           <nvpair id="nvpair.id23642" name="master-drbd-r0:1" value="75"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="f10a448b-abcb-4743-a7b9-cbb966b46462" uname="sirius" crmd="online" ha="active" in_ccm="true" join="member" expected="member" shutdown="0">
       <lrm id="f10a448b-abcb-4743-a7b9-cbb966b46462">
         <lrm_resources id="lrm_resources.id23682">
           <lrm_resource id="pingd-1:0" type="pingd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pingd-1-0_monitor_0" operation="monitor" transition-key="3:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;3:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="2" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
             <lrm_rsc_op id="pingd-1-0_start_0" operation="start" transition-key="6:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;6:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="13" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
             <lrm_rsc_op id="pingd-1-0_monitor_10000" operation="monitor" transition-key="7:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;7:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="15" crm_feature_set="2.1" rc-code="0" op-status="0" interval="10000" op-digest="4f164d8c8a42d67dd673599dc4c7e9c8"/>
           </lrm_resource>
           <lrm_resource id="ip-198" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ip-198_monitor_0" operation="monitor" transition-key="6:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;6:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="5" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="db4fe2112c192dcdba6b8c9c8f1dbc05"/>
           </lrm_resource>
           <lrm_resource id="fs-1" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs-1_monitor_0" operation="monitor" transition-key="5:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;5:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="4" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="b2b85e9ade4ce3ea16a1ecfac36761b8"/>
           </lrm_resource>
           <lrm_resource id="drbd-r0:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd-r0-0_monitor_0" operation="monitor" transition-key="4:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;4:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="3" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-0_start_0" operation="start" transition-key="17:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;17:2:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="14" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-0_monitor_21000" operation="monitor" transition-key="25:3:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;25:3:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="19" crm_feature_set="2.1" rc-code="0" op-status="0" interval="21000" op-digest="2f5bfc102c25723a9071395b38755293"/>
           </lrm_resource>
           <lrm_resource id="pollux-fencing" type="external/ipmi-soft" class="stonith">
             <lrm_rsc_op id="pollux-fencing_monitor_0" operation="monitor" transition-key="8:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;8:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="7" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="6a0dd162758f62bc52df4fcfba007119"/>
             <lrm_rsc_op id="pollux-fencing_start_0" operation="start" transition-key="50:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;50:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="11" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="6a0dd162758f62bc52df4fcfba007119"/>
             <lrm_rsc_op id="pollux-fencing_monitor_60000" operation="monitor" transition-key="51:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;51:1:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="12" crm_feature_set="2.1" rc-code="0" op-status="0" interval="60000" op-digest="eae071e4290b0acfac5e5ed2e9b87acf"/>
           </lrm_resource>
           <lrm_resource id="sirius-fencing" type="external/ipmi-soft" class="stonith">
             <lrm_rsc_op id="sirius-fencing_monitor_0" operation="monitor" transition-key="9:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;9:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="8" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="369dee444ee042bc029156a34392614f"/>
           </lrm_resource>
           <lrm_resource id="apache" type="apache2" class="ocf" provider="custom">
             <lrm_rsc_op id="apache_monitor_0" operation="monitor" transition-key="7:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;7:0:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="6" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="93b018a79565fe7ba531dc520eee7853"/>
           </lrm_resource>
           <lrm_resource id="pingd-1:1" type="pingd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pingd-1-1_monitor_0" operation="monitor" transition-key="3:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;3:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="9" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="207654c1110a472b7bf22ee8215a90f5"/>
           </lrm_resource>
           <lrm_resource id="drbd-r0:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd-r0-1_monitor_0" operation="monitor" transition-key="4:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;4:1:7:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="10" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="f10a448b-abcb-4743-a7b9-cbb966b46462">
         <instance_attributes id="instance_attributes.id24271">
           <nvpair id="nvpair.id24278" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id24288" name="pingd-1-node-attribute" value="300"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id24299">
           <nvpair id="nvpair.id24306" name="master-drbd-r0:0" value="75"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/master-13.xml b/cts/scheduler/master-13.xml
index 0965a2c223..67af8ce84d 100644
--- a/cts/scheduler/master-13.xml
+++ b/cts/scheduler/master-13.xml
@@ -1,156 +1,155 @@
 <cib admin_epoch="0" epoch="1" num_updates="45" dc-uuid="96a11b50-845a-4866-b091-a2d5ec548717" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21858" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21896" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21905" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21914" name="stop-orphan-actions" value="true"/>
-        <nvpair id="nvpair.id21933" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1190117208"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="nvpair.id2187797">
         <nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="5s"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" uname="frigg" type="member"/>
       <node id="96a11b50-845a-4866-b091-a2d5ec548717" uname="odin" type="member"/>
     </nodes>
     <resources>
       <clone id="ms_drbd">
         <meta_attributes id="meta_attributes.id22010">
           <nvpair id="nvpair.id22016" name="promotable" value="true"/>
           <nvpair id="nvpair.id22017" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22025" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22033" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22041" name="promoted-node-max" value="1"/>
           <nvpair id="nvpair.id22050" name="notify" value="yes"/>
           <nvpair id="nvpair.id22058" name="globally-unique" value="false"/>
           <nvpair id="nvpair.id22067" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive id="drbd0" class="ocf" provider="heartbeat" type="drbd">
           <instance_attributes id="instance_attributes.id22088">
             <nvpair id="nvpair.id22095" name="drbd_resource" value="r0"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="12s" id="drbd0_mon_0" timeout="5s"/>
             <op name="monitor" interval="10s" id="drbd0_mon_1" timeout="5s" role="Master"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-ms_drbd.meta"/>
       </clone>
       <group id="group">
         <primitive id="IPaddr0" class="ocf" provider="heartbeat" type="IPaddr">
           <instance_attributes id="instance_attributes.id22149">
             <nvpair id="nvpair.id22156" name="ip" value="141.89.59.22"/>
             <nvpair id="nvpair.id22164" name="netmask" value="24"/>
             <nvpair id="nvpair.id22172" name="nic" value="bond0"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="5s" id="IPaddr0_mon" timeout="5s"/>
           </operations>
         </primitive>
         <primitive id="MailTo" class="ocf" provider="heartbeat" type="MailTo">
           <instance_attributes id="instance_attributes.id22207">
             <nvpair id="nvpair.id22214" name="email" value="kittan@cs.uni-potsdam.de"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-group.meta"/>
       </group>
     </resources>
     <constraints>
       <rsc_location id="location" rsc="ms_drbd">
         <rule id="location_rule" score="-INFINITY">
           <expression id="expression.id22244" attribute="#uname" operation="ne" value="odin"/>
           <expression id="expression.id22254" attribute="#uname" operation="ne" value="frigg"/>
         </rule>
       </rsc_location>
       <rsc_location id="connected" rsc="ms_drbd">
         <rule id="connected_rule" score="-INFINITY" boolean-op="or">
           <expression id="expression.id22281" attribute="pingd" operation="not_defined"/>
           <expression id="expression.id22290" attribute="pingd" operation="lte" value="0"/>
         </rule>
       </rsc_location>
       <rsc_order id="drbd_before_group" first="ms_drbd" then="group" then-action="start" first-action="promote" kind="Optional"/>
       <rsc_colocation id="group_on_drbd" rsc="group" with-rsc="ms_drbd" with-rsc-role="Master" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="96a11b50-845a-4866-b091-a2d5ec548717" uname="odin" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22364">
           <nvpair id="nvpair.id22371" name="pingd" value="400"/>
           <nvpair id="nvpair.id22380" name="probe_complete" value="true"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22392">
           <nvpair id="nvpair.id22398" name="master-drbd0:1" value="75"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22416">
           <lrm_resource id="MailTo" type="MailTo" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="MailTo_monitor_0" operation="monitor" transition-key="9:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;9:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
           </lrm_resource>
           <lrm_resource id="IPaddr0" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr0_monitor_0" operation="monitor" transition-key="8:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;8:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
           </lrm_resource>
           <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd0-0_monitor_0" operation="monitor" transition-key="7:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;7:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
           </lrm_resource>
           <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd0-1_monitor_0" operation="monitor" transition-key="5:1:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;5:1:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd0-1_start_0" operation="start" transition-key="7:2:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;7:2:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd0-1_monitor_12000" operation="monitor" transition-key="12:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;12:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="12000" op-digest="89f7e992322e587b5c426df866b543e0"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" uname="frigg" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id22727">
           <nvpair id="nvpair.id22734" name="pingd" value="400"/>
           <nvpair id="nvpair.id22743" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id22752" name="fail-count-IPaddr0" value="1"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id22764">
           <nvpair id="nvpair.id22770" name="master-drbd0:0" value="75"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22788">
           <lrm_resource id="MailTo" type="MailTo" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="MailTo_monitor_0" operation="monitor" transition-key="5:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;5:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
             <lrm_rsc_op id="MailTo_start_0" operation="start" transition-key="39:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;39:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
             <lrm_rsc_op id="MailTo_stop_0" operation="stop" transition-key="39:6:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;39:6:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
           </lrm_resource>
           <lrm_resource id="IPaddr0" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr0_monitor_0" operation="monitor" transition-key="4:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;4:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
             <lrm_rsc_op id="IPaddr0_start_0" operation="start" transition-key="37:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;37:4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
             <lrm_rsc_op id="IPaddr0_stop_0" operation="stop" transition-key="3:6:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;3:6:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
           </lrm_resource>
           <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd0-0_monitor_0" operation="monitor" transition-key="3:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;3:0:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd0-0_start_0" operation="start" transition-key="5:2:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;5:2:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd0-0_promote_0" operation="promote" transition-key="7:3:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;7:3:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd0-0_monitor_10000" operation="monitor" transition-key="9:4:8:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:8;9:4:8:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="11" crm_feature_set="2.0" rc-code="8" op-status="0" interval="10000" op-digest="89f7e992322e587b5c426df866b543e0"/>
           </lrm_resource>
           <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd0-1_monitor_0" operation="monitor" transition-key="3:1:7:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;3:1:7:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/master-failed-demote-2.xml b/cts/scheduler/master-failed-demote-2.xml
index 65bdd27aec..a64c8f49d1 100644
--- a/cts/scheduler/master-failed-demote-2.xml
+++ b/cts/scheduler/master-failed-demote-2.xml
@@ -1,146 +1,145 @@
 <cib admin_epoch="0" epoch="1" num_updates="28" dc-uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="dc-version" value="2.1.3-node: 552305612591183b1628baa5bc6e903e0f1e26a3"/>
       </cluster_property_set>
       <cluster_property_set id="set01">
         <nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21894" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21903" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id21920" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21929" name="symmetric-cluster" value="true"/>
-        <nvpair id="nvpair.id21938" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21957" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21966" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21984" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21992" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id22001" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id22010" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id22019" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22028" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22037" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22046" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22055" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22064" name="startup-fencing" value="true"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="nvpair.id2187797">
         <nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" type="member"/>
       <node id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" type="member"/>
     </nodes>
     <resources>
       <clone id="ms-sf">
         <group id="group">
           <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="start-1" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="10" id="monitor-1m" timeout="60s" on-fail="stop" role="Master"/>
               <op name="monitor" interval="20" id="monitor-1s" timeout="60s" on-fail="stop" role="Slave"/>
               <op name="stop" interval="0" id="stop-1" timeout="60s" on-fail="stop"/>
             </operations>
           </primitive>
           <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="start-2" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="10" id="monitor-2m" timeout="60s" on-fail="stop" role="Master"/>
               <op name="monitor" interval="20" id="monitor-2s" timeout="60s" on-fail="stop" role="Slave"/>
               <op name="stop" interval="0" id="stop-2" timeout="60s" on-fail="stop"/>
             </operations>
           </primitive>
           <meta_attributes id="group-group.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="promotable.meta.auto-77" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-77" name="notify" value="false"/>
           <nvpair id="nvpair.meta.auto-83" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-85" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-87" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-89" name="promoted-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="rsc_location" rsc="ms-sf">
         <rule id="location-0" role="Master" score="100">
           <expression id="expression.id22304" attribute="#uname" operation="eq" value="dl380g5a"/>
         </rule>
         <rule id="location-1" role="Master" score="500">
           <expression id="expression.id22324" attribute="#uname" operation="eq" value="dl380g5b"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22364">
           <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="3:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;3:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_start_0" operation="start" transition-key="13:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;13:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_promote_0" operation="promote" transition-key="14:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;14:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_demote_0" operation="demote" transition-key="10:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:8;10:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="12" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="5:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;5:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="4:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;4:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_start_0" operation="start" transition-key="16:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;16:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_promote_0" operation="promote" transition-key="17:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;17:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_stop_0" operation="stop" transition-key="3:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;3:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="6:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;6:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22685">
           <nvpair id="nvpair.id22692" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id22701" name="fail-count-stateful-2:0" value="1"/>
           <nvpair id="nvpair.id22711" name="fail-count-stateful-1:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22752">
           <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="10:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;10:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-1_start_0" operation="start" transition-key="23:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;23:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-1_monitor_20000" operation="monitor" transition-key="24:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;24:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="9:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;9:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="11:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;11:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-1_start_0" operation="start" transition-key="25:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;25:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-1_monitor_20000" operation="monitor" transition-key="26:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;26:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
           <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="8:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;8:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23018">
           <nvpair id="nvpair.id23025" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/master-failed-demote.xml b/cts/scheduler/master-failed-demote.xml
index 7b96083a12..bc8d130f9b 100644
--- a/cts/scheduler/master-failed-demote.xml
+++ b/cts/scheduler/master-failed-demote.xml
@@ -1,146 +1,145 @@
 <cib admin_epoch="0" epoch="1" num_updates="28" dc-uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="dc-version" value="2.1.3-node: 552305612591183b1628baa5bc6e903e0f1e26a3"/>
       </cluster_property_set>
       <cluster_property_set id="set01">
         <nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21894" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21903" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id21920" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21929" name="symmetric-cluster" value="true"/>
-        <nvpair id="nvpair.id21938" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21957" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21966" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21984" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21992" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id22001" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id22010" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id22019" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22028" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22037" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22046" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22055" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22064" name="startup-fencing" value="true"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="nvpair.id2187797">
         <nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" type="member"/>
       <node id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" type="member"/>
     </nodes>
     <resources>
       <clone id="ms-sf">
         <group id="group">
           <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="start-1" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="10" id="monitor-1m" timeout="60s" on-fail="stop" role="Master"/>
               <op name="monitor" interval="20" id="monitor-1s" timeout="60s" on-fail="stop" role="Slave"/>
               <op name="stop" interval="0" id="stop-1" timeout="60s" on-fail="stop"/>
             </operations>
           </primitive>
           <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="start" interval="0" id="start-2" timeout="60s" on-fail="stop"/>
               <op name="monitor" interval="10" id="monitor-2m" timeout="60s" on-fail="stop" role="Master"/>
               <op name="monitor" interval="20" id="monitor-2s" timeout="60s" on-fail="stop" role="Slave"/>
               <op name="stop" interval="0" id="stop-2" timeout="60s" on-fail="stop"/>
             </operations>
           </primitive>
           <meta_attributes id="group-group.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="promotable.meta.auto-77" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-77" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-83" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-85" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-87" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-89" name="promoted-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="rsc_location" rsc="ms-sf">
         <rule id="location-0" role="Master" score="100">
           <expression id="expression.id22304" attribute="#uname" operation="eq" value="dl380g5a"/>
         </rule>
         <rule id="location-1" role="Master" score="500">
           <expression id="expression.id22324" attribute="#uname" operation="eq" value="dl380g5b"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22364">
           <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="3:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;3:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_start_0" operation="start" transition-key="13:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;13:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_promote_0" operation="promote" transition-key="14:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;14:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-0_demote_0" operation="demote" transition-key="10:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:8;10:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="12" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="5:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;5:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="4:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;4:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_start_0" operation="start" transition-key="16:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;16:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_promote_0" operation="promote" transition-key="17:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;17:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-0_stop_0" operation="stop" transition-key="3:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;3:5:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="6:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;6:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22685">
           <nvpair id="nvpair.id22692" name="probe_complete" value="true"/>
           <nvpair id="nvpair.id22701" name="fail-count-stateful-2:0" value="1"/>
           <nvpair id="nvpair.id22711" name="fail-count-stateful-1:0" value="1"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22752">
           <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="10:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;10:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-1_start_0" operation="start" transition-key="23:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;23:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-1-1_monitor_20000" operation="monitor" transition-key="24:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;24:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="9:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;9:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="11:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;11:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-1_start_0" operation="start" transition-key="25:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;25:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="stateful-2-1_monitor_20000" operation="monitor" transition-key="26:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;26:3:0:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
           </lrm_resource>
           <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="8:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;8:3:7:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23018">
           <nvpair id="nvpair.id23025" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/master-group.xml b/cts/scheduler/master-group.xml
index 3459c1701a..7193eda5ba 100644
--- a/cts/scheduler/master-group.xml
+++ b/cts/scheduler/master-group.xml
@@ -1,148 +1,147 @@
 <cib admin_epoch="0" epoch="80" num_updates="23" dc-uuid="782b1222-d1b9-4993-8f0d-b8b67801a2c8" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:07 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21858" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21868" name="stonith-enabled" value="false"/>
-        <nvpair id="nvpair.id21876" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21903" name="stop-orphan-resources" value="true"/>
         <nvpair id="nvpair.id21912" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21940" name="stonith-action" value="reboot"/>
         <nvpair id="nvpair.id21957" name="dc-deadtime" value="10s"/>
         <nvpair id="nvpair.id21965" name="cluster-recheck-interval" value="0"/>
         <nvpair id="nvpair.id21974" name="election-timeout" value="2min"/>
         <nvpair id="nvpair.id21983" name="shutdown-escalation" value="20min"/>
         <nvpair id="nvpair.id21992" name="crmd-integration-timeout" value="3min"/>
         <nvpair id="nvpair.id22001" name="crmd-finalization-timeout" value="10min"/>
         <nvpair id="nvpair.id22010" name="cluster-delay" value="180s"/>
         <nvpair id="nvpair.id22019" name="pe-error-series-max" value="-1"/>
         <nvpair id="nvpair.id22028" name="pe-warn-series-max" value="-1"/>
         <nvpair id="nvpair.id22037" name="pe-input-series-max" value="-1"/>
         <nvpair id="nvpair.id22045" name="startup-fencing" value="true"/>
         <nvpair id="nvpair.id22054" name="dc-version" value="2.1.3-node: 176f519910028b93e655fe4d2d376037bf8dd0d4"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="782b1222-d1b9-4993-8f0d-b8b67801a2c8" uname="rh44-1" type="member"/>
       <node id="86600d98-4564-433a-8ad7-aca0ca59382a" uname="rh44-2" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="INFINITY"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <group id="test">
         <primitive id="resource_1" class="ocf" type="IPaddr" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22105">
             <nvpair id="nvpair.id22113" name="ip" value="192.168.40.92"/>
             <nvpair id="nvpair.id22121" name="nic" value="eth0"/>
             <nvpair id="nvpair.id22130" name="cidr_netmask" value="24"/>
           </instance_attributes>
           <operations>
             <op name="start" interval="0" id="ipPostgreSQLDB_start" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
             <op name="monitor" interval="10s" id="ipPostgreSQLDB_monitor" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
             <op name="stop" interval="0" id="ipPostgreSQLDB_stop" timeout="60s" on-fail="fence" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="group-test.meta"/>
       </group>
       <clone id="ms-sf">
         <meta_attributes id="meta_attributes.id22211">
           <nvpair id="nvpair.id22216" name="promotable" value="true"/>
           <nvpair id="nvpair.id22217" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22226" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22234" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22243" name="promoted-node-max" value="1"/>
         </meta_attributes>
         <group id="grp_ms_sf">
           <primitive id="master_slave_Stateful" class="ocf" type="Stateful" provider="heartbeat">
             <operations>
               <op name="monitor" interval="5s" id="ms-sf_monitor" timeout="30s"/>
               <op name="monitor" interval="6s" id="ms-sf_monitor_master" timeout="30s" role="Master"/>
             </operations>
           </primitive>
           <meta_attributes id="group-grp_ms_sf.meta"/>
         </group>
         <meta_attributes id="clone-ms-sf.meta">
           <nvpair id="ordered.meta.auto-98" name="ordered" value="false"/>
           <nvpair id="interleave.meta.auto-98" name="interleave" value="false"/>
           <nvpair id="notify.meta.auto-98" name="notify" value="false"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="rlcPostgreSQLDB" rsc="test">
         <rule id="rulPostgreSQLDB_node01" score="200">
           <expression id="expression.id22323" attribute="#uname" operation="eq" value="rh44-1"/>
         </rule>
         <rule id="rulPostgreSQLDB_node02" score="100">
           <expression id="expression.id22341" attribute="#uname" operation="eq" value="rh44-2"/>
         </rule>
       </rsc_location>
       <rsc_location id="rsc_location_group_0" rsc="ms-sf">
         <rule id="preferred_location_group_0" role="Master" score="100">
           <expression id="expression.id22369" attribute="#uname" operation="eq" value="rh44-1"/>
         </rule>
         <rule id="preferred_location_group_1" role="Master" score="50">
           <expression id="expression.id22390" attribute="#uname" operation="eq" value="rh44-2"/>
         </rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="782b1222-d1b9-4993-8f0d-b8b67801a2c8" uname="rh44-1" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22436">
           <lrm_resource id="master_slave_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;5:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;17:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="master_slave_Stateful-1_monitor_5000" operation="monitor" transition-key="18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;18:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
           </lrm_resource>
           <lrm_resource id="master_slave_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;4:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="resource_1" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="resource_1_monitor_0" operation="monitor" transition-key="3:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;3:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
             <lrm_rsc_op id="resource_1_start_0" operation="start" transition-key="5:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;5:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="5" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
             <lrm_rsc_op id="resource_1_monitor_10000" operation="monitor" transition-key="8:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;8:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="10000" op-digest="ab399f581fad689b92f5edad92fd0356"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.id22661">
           <nvpair id="nvpair.id22668" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="86600d98-4564-433a-8ad7-aca0ca59382a" uname="rh44-2" ha="active" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id22709">
           <lrm_resource id="master_slave_Stateful:0" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;8:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;11:1:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="5" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="master_slave_Stateful-0_monitor_5000" operation="monitor" transition-key="15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:0;15:2:0:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="5000" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
           </lrm_resource>
           <lrm_resource id="master_slave_Stateful:1" type="Stateful" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;9:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="resource_1" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="resource_1_monitor_0" operation="monitor" transition-key="7:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" transition-magic="0:7;7:0:7:f8daff63-8d0f-4e18-a9b3-6ccd910175bd" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="cf453c0695bcf0a97aa217bbc913b737"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id22886">
           <nvpair id="nvpair.id22893" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/master-ordering.xml b/cts/scheduler/master-ordering.xml
index 11f2fb6d9f..a2e80b8434 100644
--- a/cts/scheduler/master-ordering.xml
+++ b/cts/scheduler/master-ordering.xml
@@ -1,282 +1,281 @@
 <cib admin_epoch="0" epoch="340" num_updates="42004" dc-uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:08 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="default">
         <nvpair id="nvpair.id21850" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21859" name="transition-idle-timeout" value="60"/>
-        <nvpair id="nvpair.id21876" name="short-resource-names" value="true"/>
         <nvpair id="nvpair.id21885" name="no-quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21894" name="stop-orphan-resources" value="false"/>
         <nvpair id="nvpair.id21904" name="stop-orphan-actions" value="true"/>
         <nvpair id="nvpair.id21931" name="stonith-enabled" value="false"/>
         <nvpair id="nvpair.id21939" name="stonith-action" value="reboot"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" type="member"/>
       <node id="917954cd-0285-4fcd-9cd2-671736c4de66" uname="webcluster02" type="member"/>
     </nodes>
     <resources>
       <primitive id="extip_1" class="ocf" type="IPaddr2" provider="heartbeat">
         <operations>
           <op name="monitor" interval="30s" id="extip_1_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id21999">
           <nvpair id="nvpair.id22005" name="ip" value="85.125.191.221"/>
           <nvpair id="nvpair.id22014" name="netmask" value="28"/>
           <nvpair id="nvpair.id22022" name="nic" value="eth0"/>
           <nvpair id="nvpair.id22030" name="target_role" value="started"/>
         </instance_attributes>
         <meta_attributes id="primitive-extip_1.meta">
           <nvpair id="nvpair.meta.auto-62" name="target-role" value="started"/>
         </meta_attributes>
       </primitive>
       <primitive id="extip_2" class="ocf" type="IPaddr2" provider="heartbeat">
         <operations>
           <op name="monitor" interval="30s" id="extip_2_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22066">
           <nvpair id="nvpair.id22072" name="ip" value="85.125.191.222"/>
           <nvpair id="nvpair.id22081" name="netmask" value="28"/>
           <nvpair id="nvpair.id22089" name="nic" value="eth0"/>
           <nvpair id="nvpair.id22097" name="target_role" value="started"/>
         </instance_attributes>
         <meta_attributes id="primitive-extip_2.meta">
           <nvpair id="nvpair.meta.auto-84" name="target-role" value="started"/>
         </meta_attributes>
       </primitive>
       <group id="group_main">
         <primitive id="intip_0_main" class="ocf" type="IPaddr2" provider="heartbeat">
           <operations>
             <op name="monitor" interval="30s" id="intip_0_mon" timeout="30s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22137">
             <nvpair id="nvpair.id22144" name="ip" value="192.168.100.200"/>
             <nvpair id="nvpair.id22152" name="netmask" value="24"/>
             <nvpair id="nvpair.id22160" name="nic" value="eth1"/>
             <nvpair id="nvpair.id22168" name="target_role" value="started"/>
           </instance_attributes>
           <meta_attributes id="primitive-intip_0_main.meta">
             <nvpair id="nvpair.meta.auto-108" name="target-role" value="started"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="group-group_main.meta"/>
       </group>
       <primitive id="intip_1_master" class="ocf" type="IPaddr2" provider="heartbeat">
         <operations>
           <op name="monitor" interval="30s" id="intip_1_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22205">
           <nvpair id="nvpair.id22211" name="ip" value="192.168.100.201"/>
           <nvpair id="nvpair.id22220" name="netmask" value="24"/>
           <nvpair id="nvpair.id22228" name="nic" value="eth1"/>
           <nvpair id="nvpair.id22236" name="target_role" value="started"/>
         </instance_attributes>
         <meta_attributes id="primitive-intip_1_master.meta">
           <nvpair id="nvpair.meta.auto-131" name="target-role" value="started"/>
         </meta_attributes>
       </primitive>
       <primitive id="intip_2_slave" class="ocf" type="IPaddr2" provider="heartbeat">
         <operations>
           <op name="monitor" interval="30s" id="intip_2_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22272">
           <nvpair id="nvpair.id22278" name="ip" value="192.168.100.202"/>
           <nvpair id="nvpair.id22286" name="netmask" value="24"/>
           <nvpair id="nvpair.id22294" name="nic" value="eth1"/>
           <nvpair id="nvpair.id22303" name="target_role" value="started"/>
         </instance_attributes>
         <meta_attributes id="primitive-intip_2_slave.meta">
           <nvpair id="nvpair.meta.auto-153" name="target-role" value="started"/>
         </meta_attributes>
       </primitive>
       <clone id="ms_drbd_www">
         <meta_attributes id="meta_attributes.id22319">
           <nvpair id="nvpair.id22324" name="promotable" value="true"/>
           <nvpair id="nvpair.id22325" name="promoted-max" value="2"/>
           <nvpair id="nvpair.id22334" name="promoted-node-max" value="1"/>
           <nvpair id="nvpair.id22342" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22351" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22360" name="target-role" value="started"/>
           <nvpair id="nvpair.id22368" name="globally-unique" value="false"/>
           <nvpair id="nvpair.id22377" name="notify" value="yes"/>
         </meta_attributes>
         <primitive id="drbd_www" class="ocf" provider="heartbeat" type="drbd">
           <operations>
             <op name="monitor" interval="5s" id="drbd_www_mon_normal" timeout="10s" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22415">
             <nvpair id="nvpair.id22421" name="drbd_resource" value="www"/>
             <nvpair id="nvpair.id22430" name="clone_overrides_hostname" value="yes"/>
             <nvpair id="nvpair.id22439" name="target_role" value="started"/>
           </instance_attributes>
           <meta_attributes id="primitive-drbd_www.meta">
             <nvpair id="nvpair.meta.auto-195" name="target-role" value="started"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="clone-ms_drbd_www.meta"/>
       </clone>
       <clone id="clone_ocfs2_www">
         <primitive id="ocfs2_www" class="ocf" provider="heartbeat" type="Filesystem">
           <operations>
             <op name="monitor" interval="120s" id="ocfs2_www_mon" timeout="60s"/>
           </operations>
           <instance_attributes id="instance_attributes.id22515">
             <nvpair id="nvpair.id22521" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22530" name="directory" value="/data/www"/>
             <nvpair id="nvpair.id22539" name="fstype" value="ocfs2"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="clone-clone_ocfs2_www.meta">
           <nvpair id="nvpair.meta.auto-211" name="target-role" value="started"/>
           <nvpair id="nvpair.meta.auto-207" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-209" name="clone-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
       <clone id="clone_webservice">
         <group id="group_webservice">
           <primitive id="apache2" class="ocf" type="apache" provider="heartbeat">
             <operations>
               <op name="monitor" interval="60s" id="apache2_mon" timeout="300s"/>
             </operations>
             <instance_attributes id="instance_attributes.id22620">
               <nvpair id="nvpair.id22626" name="httpd" value="/usr/sbin/apache2"/>
               <nvpair id="nvpair.id22635" name="options" value="-k start"/>
               <nvpair id="nvpair.id22644" name="configfile" value="/etc/apache2/apache2.conf"/>
               <nvpair id="nvpair.id22653" name="target_role" value="started"/>
             </instance_attributes>
             <meta_attributes id="primitive-apache2.meta">
               <nvpair id="nvpair.meta.auto-269" name="target-role" value="started"/>
             </meta_attributes>
           </primitive>
           <primitive id="mysql-proxy" class="lsb" type="mysql-proxy">
             <operations>
               <op name="monitor" interval="10s" id="mysql-proxy_mon" timeout="20s"/>
             </operations>
             <instance_attributes id="instance_attributes.id22689">
               <nvpair id="nvpair.id22695" name="target_role" value="started"/>
             </instance_attributes>
             <meta_attributes id="primitive-mysql-proxy.meta">
               <nvpair id="nvpair.meta.auto-285" name="target-role" value="started"/>
             </meta_attributes>
           </primitive>
           <meta_attributes id="group-group_webservice.meta"/>
         </group>
         <meta_attributes id="clone-clone_webservice.meta">
           <nvpair id="nvpair.meta.auto-246" name="target-role" value="started"/>
           <nvpair id="nvpair.meta.auto-242" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-244" name="clone-node-max" value="1"/>
           <nvpair id="unique-2" name="globally-unique" value="true"/>
         </meta_attributes>
       </clone>
       <clone id="ms_drbd_mysql">
         <meta_attributes id="meta_attributes.id22714">
           <nvpair id="nvpair.id22719" name="promotable" value="true"/>
           <nvpair id="nvpair.id22720" name="promoted-max" value="1"/>
           <nvpair id="nvpair.id22729" name="promoted-node-max" value="1"/>
           <nvpair id="nvpair.id22737" name="clone-max" value="2"/>
           <nvpair id="nvpair.id22746" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.id22754" name="target-role" value="started"/>
           <nvpair id="nvpair.id22763" name="globally-unique" value="false"/>
           <nvpair id="nvpair.id22772" name="notify" value="yes"/>
           <nvpair id="unique-3" name="globally-unique" value="true"/>
         </meta_attributes>
         <primitive id="drbd_mysql" class="ocf" provider="heartbeat" type="drbd">
           <operations>
             <op name="monitor" interval="5s" id="drbd_mysql_mon_normal" timeout="10s" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22809">
             <nvpair id="nvpair.id22815" name="drbd_resource" value="mysql1"/>
             <nvpair id="nvpair.id22824" name="clone_overrides_hostname" value="yes"/>
             <nvpair id="nvpair.id22833" name="target_role" value="started"/>
           </instance_attributes>
           <meta_attributes id="primitive-drbd_mysql.meta">
             <nvpair id="nvpair.meta.auto-329" name="target-role" value="started"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="clone-ms_drbd_mysql.meta"/>
       </clone>
       <primitive id="fs_mysql" class="ocf" provider="heartbeat" type="Filesystem">
         <operations>
           <op name="monitor" interval="30s" id="fs_mysql_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22870">
           <nvpair id="nvpair.id22876" name="device" value="/dev/drbd1"/>
           <nvpair id="nvpair.id22885" name="directory" value="/data/mysql"/>
           <nvpair id="nvpair.id22893" name="fstype" value="ext3"/>
         </instance_attributes>
       </primitive>
       <primitive id="mysql-server" class="ocf" provider="heartbeat" type="mysql">
         <operations>
           <op name="monitor" interval="30s" id="mysql-server_mon" timeout="30s"/>
         </operations>
         <instance_attributes id="instance_attributes.id22929">
           <nvpair id="nvpair.id22935" name="target_role" value="started"/>
           <nvpair id="nvpair.id22944" name="priority" value="1000"/>
           <nvpair id="nvpair.id22953" name="config" value="/etc/mysql/my.cnf"/>
           <nvpair id="nvpair.id22962" name="socket" value="/var/run/mysqld/mysqld.sock"/>
           <nvpair id="nvpair.id22971" name="pid" value="/var/run/mysqld/mysqld.pid"/>
           <nvpair id="nvpair.id22980" name="datadir" value="/data/mysql/"/>
           <nvpair id="nvpair.id22989" name="binary" value="/usr/sbin/mysqld"/>
           <nvpair id="nvpair.id22998" name="additional_parameters" value="--basedir=/usr --skip-external-locking --port=42006"/>
         </instance_attributes>
         <meta_attributes id="primitive-mysql-server.meta">
           <nvpair id="nvpair.meta.auto-366" name="target-role" value="started"/>
           <nvpair id="nvpair.meta.auto-368" name="priority" value="1000"/>
         </meta_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="run_extip_1" rsc="extip_1">
         <rule id="pref_run_extip_1" score="100">
           <expression attribute="#uname" operation="eq" value="webcluster01" id="expression.id23028"/>
         </rule>
       </rsc_location>
       <rsc_location id="run_extip_2" rsc="extip_2">
         <rule id="pref_run_extip_2" score="100">
           <expression attribute="#uname" operation="eq" value="webcluster02" id="expression.id23052"/>
         </rule>
       </rsc_location>
       <rsc_location id="run_intip_0_main" rsc="group_main">
         <rule id="pref_run_intip_0" score="100">
           <expression attribute="#uname" operation="eq" value="webcluster01" id="expression.id23076"/>
         </rule>
       </rsc_location>
       <rsc_location id="run_intip_1_master" rsc="intip_1_master">
         <rule id="pref_run_intip_1" score="200">
           <expression attribute="#uname" operation="eq" value="webcluster01" id="expression.id23101"/>
         </rule>
       </rsc_location>
       <rsc_location id="run_intip_2_slave" rsc="intip_2_slave">
         <rule id="pref_run_intip_2_wc2" score="100">
           <expression attribute="#uname" operation="eq" value="webcluster02" id="expression.id23125"/>
         </rule>
       </rsc_location>
       <rsc_order id="order_drbd_mysql_ip0" first-action="start" first="intip_1_master" then="ms_drbd_mysql"/>
       <rsc_order id="order_drbd_mysql_ip1" first-action="start" first="intip_2_slave" then="ms_drbd_mysql"/>
       <rsc_order id="order_drbd_www_ip0" first-action="start" first="intip_1_master" then="ms_drbd_www"/>
       <rsc_order id="order_drbd_www_ip1" first-action="start" first="intip_2_slave" then="ms_drbd_www"/>
       <rsc_colocation id="colo_drbd_mysql_ip0" rsc="drbd_mysql" with-rsc="intip_1_master" rsc-role="Master"/>
       <rsc_colocation id="colo_drbd_mysql_ip1" rsc="drbd_mysql" with-rsc="intip_2_slave" rsc-role="Slave" score="100"/>
       <rsc_colocation id="colo_drbd_www_ip0" rsc="drbd_www" with-rsc="intip_1_master" rsc-role="Master" score="100"/>
       <rsc_colocation id="colo_drbd_www_ip1" rsc="drbd_www" with-rsc="intip_2_slave" rsc-role="Slave" score="100"/>
       <rsc_order id="drbd_before_fs_mysql" first="ms_drbd_mysql" then="fs_mysql" then-action="start" first-action="promote"/>
       <rsc_colocation id="colo_drbd_fs_mysql" rsc="fs_mysql" with-rsc="ms_drbd_mysql" with-rsc-role="Master" score="INFINITY"/>
       <rsc_order id="drbd_before_ocfs2_www" first="ms_drbd_www" then="clone_ocfs2_www" then-action="start" first-action="promote"/>
       <rsc_colocation id="colo_ddrbd_ocfs2_www" rsc="clone_ocfs2_www" with-rsc="ms_drbd_www" with-rsc-role="Master" score="INFINITY"/>
       <rsc_order id="mysql-server_after_fs_mysql" first="fs_mysql" then="mysql-server" then-action="start" first-action="start"/>
       <rsc_colocation id="colo_mysql-server_and_fs_mysql" rsc="mysql-server" with-rsc="fs_mysql" with-rsc-role="Started" score="INFINITY"/>
       <rsc_order id="webservices_after_ocfs2_www" first="clone_ocfs2_www" then="clone_webservice" then-action="start" first-action="start"/>
       <rsc_colocation id="colo_webservices_and_ocfs2_www" rsc="clone_webservice" with-rsc="clone_ocfs2_www" with-rsc-role="Started" score="INFINITY"/>
       <rsc_colocation id="colocate_mysql-server_ip0" rsc="intip_0_main" with-rsc="mysql-server" with-rsc-role="Started" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id23409"/>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/probe-2.xml b/cts/scheduler/probe-2.xml
index 516bc643ac..5bd58ee9e1 100644
--- a/cts/scheduler/probe-2.xml
+++ b/cts/scheduler/probe-2.xml
@@ -1,482 +1,481 @@
 <cib admin_epoch="0" epoch="5" num_updates="1" have-quorum="1" remote-tls-port="0" validate-with="pacemaker-3.0" crm_feature_set="3.0" dc-uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" cib-last-written="Fri Jul 13 13:51:12 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="default">
         <nvpair id="symmetric-cluster" name="symmetric-cluster" value="true"/>
         <nvpair id="transition-idle-timeout" name="transition-idle-timeout" value="60"/>
-        <nvpair id="short-resource-names" name="short-resource-names" value="true"/>
         <nvpair id="no-quorum-policy" name="no-quorum-policy" value="stop"/>
         <nvpair id="stop-orphan-resources" name="stop-orphan-resources" value="false"/>
         <nvpair id="stop-orphan-actions" name="stop-orphan-actions" value="true"/>
         <nvpair id="stonith-enabled" name="stonith-enabled" value="true"/>
         <nvpair id="stonith-action" name="stonith-action" value="reboot"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.1-node: 6fc5ce8302abf145a02891ec41e5a492efbe8efe"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" uname="wc01" type="member">
         <instance_attributes id="node_1_ia">
           <nvpair id="node_1_cluster_group" name="cluster_group" value="web"/>
         </instance_attributes>
       </node>
       <node id="f36760d8-d84a-46b2-b452-4c8cac8b3396" uname="wc02" type="member">
         <instance_attributes id="node_2_ia">
           <nvpair id="node_2_cluster_group" name="cluster_group" value="web"/>
         </instance_attributes>
         <instance_attributes id="nodes-f36760d8-d84a-46b2-b452-4c8cac8b3396">
           <nvpair id="standby-f36760d8-d84a-46b2-b452-4c8cac8b3396" name="standby" value="on"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <group id="group_www_data">
         <primitive class="ocf" id="fs_www_data" provider="heartbeat" type="Filesystem">
           <operations>
             <op id="fs_www_data_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="fs_www_data_ia">
             <nvpair id="fs_www_data_attr_0" name="device" value="/dev/drbd0"/>
             <nvpair id="fs_www_data_attr_1" name="directory" value="/share/drbd_www/"/>
             <nvpair id="fs_www_data_attr_2" name="fstype" value="ext3"/>
           </instance_attributes>
         </primitive>
         <primitive id="nfs-kernel-server" class="lsb" type="nfs-kernel-server"/>
         <primitive id="intip_nfs" class="ocf" type="IPaddr2" provider="heartbeat">
           <operations>
             <op id="intip_nfs_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="intip_nfs_ia">
             <nvpair id="intip_nfs_1" name="ip" value="192.168.100.203"/>
             <nvpair id="intip_nfs_2" name="netmask" value="24"/>
             <nvpair id="intip_nfs_3" name="nic" value="eth1"/>
             <nvpair id="intip_nfs_role" name="target-role" value="Started"/>
           </instance_attributes>
         </primitive>
       </group>
       <clone id="ms_drbd_mysql">
         <meta_attributes id="ms_drbd_mysql_ma">
           <nvpair id="ms_drbd_mysql_promotable" name="promotable" value="true"/>
           <nvpair id="ms_drbd_mysql_promoted-max" name="promoted-max" value="1"/>
           <nvpair id="ms_drbd_mysql_promoted-node-max" name="promoted-node-max" value="1"/>
           <nvpair id="ms_drbd_mysql_clone-max" name="clone-max" value="2"/>
           <nvpair id="ms_drbd_mysql_clone-node-max" name="clone-node-max" value="1"/>
           <nvpair id="ms_drbd_mysql_clone_role" name="target-role" value="Started"/>
           <nvpair id="ms_drbd_mysql_globally-unique" name="globally-unique" value="false"/>
           <nvpair id="ms_drbd_mysql_notify" name="notify" value="yes"/>
           <nvpair id="ms_drbd_mysql_interleave" name="interleave" value="true"/>
           <nvpair id="ms_drbd_mysql_target-role" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive id="drbd_mysql" class="ocf" provider="heartbeat" type="drbd">
           <operations>
             <op name="monitor" id="drbd_mysql_mon_normal" interval="15s" timeout="10s" role="Started"/>
             <op name="monitor" id="drbd_mysql_mon_slave" interval="10s" timeout="10s" role="Slave"/>
             <op name="monitor" id="drbd_mysql_mon_master" interval="5s" timeout="10s" role="Master"/>
           </operations>
           <instance_attributes id="drbd_mysql_ia">
             <nvpair id="drbd_mysql_attr_0" name="drbd_resource" value="mysql"/>
             <nvpair id="drbd_mysql_clone_overrides_hostname" name="clone-overrides-hostname" value="no"/>
           </instance_attributes>
         </primitive>
       </clone>
       <group id="group_mysql">
         <primitive class="ocf" id="fs_mysql" provider="heartbeat" type="Filesystem">
           <operations>
             <op id="fs_mysql_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="fs_mysql_ia">
             <nvpair id="fs_mysql_attr_0" name="device" value="/dev/drbd1"/>
             <nvpair id="fs_mysql_attr_1" name="directory" value="/data/mysql"/>
             <nvpair id="fs_mysql_attr_2" name="fstype" value="ext3"/>
           </instance_attributes>
         </primitive>
         <primitive id="intip_sql" class="ocf" type="IPaddr2" provider="heartbeat">
           <operations>
             <op id="intip_sql_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="intip_sql_ia">
             <nvpair id="intip_sql_1" name="ip" value="192.168.100.200"/>
             <nvpair id="intip_sql_2" name="netmask" value="24"/>
             <nvpair id="intip_sql_3" name="nic" value="eth1"/>
             <nvpair id="intip_sql_role" name="target-role" value="Started"/>
           </instance_attributes>
         </primitive>
         <primitive id="mysql-server" class="ocf" provider="heartbeat" type="mysql">
           <operations>
             <op id="mysql-server_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="mysql-server_ia">
             <nvpair id="mysql-server_role" name="target-role" value="Started"/>
             <nvpair id="mysql-server_priority" name="priority" value="1000"/>
             <nvpair id="mysql-server_config" name="config" value="/etc/mysql/my.cnf"/>
             <nvpair id="mysql-server_socket" name="socket" value="/var/run/mysqld/mysqld.sock"/>
             <nvpair id="mysql-server_pid" name="pid" value="/var/run/mysqld/mysqld.pid"/>
             <nvpair id="mysql-server_datadir" name="datadir" value="/data/mysql/data/"/>
             <nvpair id="mysql-server_binary" name="binary" value="/usr/sbin/mysqld"/>
             <nvpair id="mysql-server_additional_parameters" name="additional_parameters" value="--basedir=/usr --skip-external-locking --port=42006"/>
           </instance_attributes>
         </primitive>
       </group>
       <clone id="ms_drbd_www">
         <meta_attributes id="ms_drbd_www_ma">
           <nvpair id="ms_drbd_www_promotable" name="promotable" value="true"/>
           <nvpair id="ms_drbd_www_promoted-max" name="promoted-max" value="1"/>
           <nvpair id="ms_drbd_www_promoted-node-max" name="promoted-node-max" value="1"/>
           <nvpair id="ms_drbd_www_clone-max" name="clone-max" value="2"/>
           <nvpair id="ms_drbd_www_clone-node-max" name="clone-node-max" value="1"/>
           <nvpair id="ms_drbd_www_clone_role" name="target-role" value="Started"/>
           <nvpair id="ms_drbd_www_globally-unique" name="globally-unique" value="false"/>
           <nvpair id="ms_drbd_www_notify" name="notify" value="yes"/>
           <nvpair id="ms_drbd_www_interleave" name="interleave" value="true"/>
           <nvpair id="ms_drbd_www_targe-trole" name="target-role" value="Started"/>
         </meta_attributes>
         <primitive class="ocf" id="drbd_www" provider="heartbeat" type="drbd">
           <operations>
             <op name="monitor" id="drbd_www_mon_normal" interval="15s" timeout="10s" role="Started"/>
             <op name="monitor" id="drbd_www_mon_slave" interval="10s" timeout="10s" role="Slave"/>
             <op name="monitor" id="drbd_www_mon_master" interval="5s" timeout="10s" role="Master"/>
           </operations>
           <instance_attributes id="drbd_www_ia">
             <nvpair id="drbd_www_attr_0" name="drbd_resource" value="www"/>
             <nvpair id="drbd_www_clone_overrides_hostname" name="clone-overrides-hostname" value="no"/>
           </instance_attributes>
         </primitive>
       </clone>
       <clone id="clone_nfs-common">
         <meta_attributes id="clone_nfs-common_meta">
           <nvpair id="clone_nfs-common_meta_interleave" name="interleave" value="true"/>
           <nvpair id="clone_nfs-common_meta_globally-unique" name="globally-unique" value="false"/>
           <nvpair id="clone_nfs-common_max" name="clone-max" value="2"/>
           <nvpair id="clone_nfs-common_node_max" name="clone-node-max" value="1"/>
           <nvpair id="clone_nfs-common_role" name="target-role" value="Started"/>
         </meta_attributes>
         <group id="group_nfs-common">
           <primitive id="nfs-common" class="lsb" type="nfs-common">
             <operations>
               <op id="nfs-common_mon" name="monitor" interval="10s" timeout="20s"/>
             </operations>
             <instance_attributes id="nfs-common_ia">
               <nvpair id="nfs-common_role" name="target-role" value="Started"/>
             </instance_attributes>
           </primitive>
         </group>
       </clone>
       <clone id="clone_mysql-proxy">
         <meta_attributes id="clone_mysql-proxy_meta">
           <nvpair id="clone_mysql-proxy_meta_interleave" name="interleave" value="true"/>
           <nvpair id="clone_mysql-proxy_meta_globally-unique" name="globally-unique" value="false"/>
         </meta_attributes>
         <instance_attributes id="clone_mysql-proxy_ia">
           <nvpair id="clone_mysql-proxy_max" name="clone-max" value="2"/>
           <nvpair id="clone_mysql-proxy_node_max" name="clone-node-max" value="1"/>
           <nvpair id="clone_mysql-proxy_role" name="target-role" value="Started"/>
         </instance_attributes>
         <group id="group_mysql-proxy">
           <primitive id="mysql-proxy" class="lsb" type="mysql-proxy">
             <operations>
               <op id="mysql-proxy_mon" name="monitor" interval="10s" timeout="20s"/>
             </operations>
             <instance_attributes id="mysql-proxy_ia">
               <nvpair id="mysql-proxy_role" name="target-role" value="Started"/>
             </instance_attributes>
           </primitive>
         </group>
       </clone>
       <clone id="clone_webservice">
         <meta_attributes id="clone_webservice_meta">
           <nvpair id="clone_webservice_meta_interleave" name="interleave" value="true"/>
         </meta_attributes>
         <instance_attributes id="clone_webservice_ia">
           <nvpair id="clone_webservice_max" name="clone-max" value="2"/>
           <nvpair id="clone_webservice_node_max" name="clone-node-max" value="1"/>
           <nvpair id="clone_webservice_role" name="target-role" value="Started"/>
         </instance_attributes>
         <group id="group_webservice">
           <primitive class="ocf" id="fs_www" provider="heartbeat" type="Filesystem">
             <operations>
               <op id="fs_www_mon" interval="30s" name="monitor" timeout="30s"/>
             </operations>
             <instance_attributes id="fs_www_ia">
               <nvpair id="fs_www_attr_0" name="device" value="wcnfs:/share/drbd_www/data/"/>
               <nvpair id="fs_www_attr_1" name="directory" value="/data/www"/>
               <nvpair id="fs_www_attr_2" name="fstype" value="nfs"/>
             </instance_attributes>
           </primitive>
           <primitive id="apache2" class="ocf" type="apache" provider="heartbeat">
             <operations>
               <op id="apache2_mon" name="monitor" interval="60s" timeout="300s"/>
             </operations>
             <instance_attributes id="apache2_ia">
               <nvpair id="apache2_httpd" name="httpd" value="/usr/sbin/apache2"/>
               <nvpair id="apache2_httpd_options" name="options" value="-k start"/>
               <nvpair id="apache2_httpd_conf" name="configfile" value="/etc/apache2/apache2.conf"/>
               <nvpair id="apache2_httpd_statusurl" name="statusurl" value="http://localhost/server-status/"/>
               <nvpair id="apache2_role" name="target-role" value="Started"/>
               <nvpair id="apache2_envfiles" name="envfiles" value="/etc/apache2/envvars"/>
             </instance_attributes>
           </primitive>
         </group>
       </clone>
       <group id="group_ftpd">
         <primitive id="extip_ftp" class="ocf" type="IPaddr2" provider="heartbeat">
           <operations>
             <op id="extip_ftp_mon" interval="30s" name="monitor" timeout="30s"/>
           </operations>
           <instance_attributes id="extip_ftp_ia">
             <nvpair id="extip_ftp_1" name="ip" value="192.168.1.223"/>
             <nvpair id="extip_ftp_2" name="netmask" value="24"/>
             <nvpair id="extip_ftp_3" name="nic" value="eth0"/>
             <nvpair id="extip_ftp_role" name="target-role" value="Started"/>
           </instance_attributes>
         </primitive>
         <primitive id="pure-ftpd" class="ocf" provider="heartbeat" type="Pure-FTPd">
           <operations>
             <op id="pure-ftpd_mon" name="monitor" interval="10s" timeout="20s"/>
           </operations>
           <instance_attributes id="pure-ftpd_ia">
             <nvpair id="pure-ftpd_role" name="target-role" value="Started"/>
             <nvpair id="pure-ftpd_script" name="script" value="/usr/sbin/pure-ftpd-wrapper"/>
             <nvpair id="pure-ftpd_pidfile" name="pidfile" value="/var/run/pure-ftpd/pure-ftpd.pid"/>
             <nvpair id="pure-ftpd_daemon_type" name="daemon_type" value="mysql"/>
           </instance_attributes>
         </primitive>
       </group>
       <clone id="DoFencing">
         <meta_attributes id="doFancing_m">
           <nvpair id="doFencing_ma_globally-unique" name="globally-unique" value="true"/>
           <nvpair id="doFencing_ma_clone-max" name="clone-max" value="2"/>
           <nvpair id="doFencing_ma_clone-node-max" name="clone-node-max" value="1"/>
         </meta_attributes>
         <primitive id="stonith_rackpdu" class="stonith" type="external/rackpdu">
           <operations>
             <op id="stonith_rackpdu_monitor" name="monitor" interval="5s" timeout="20s"/>
             <op id="sontith_rackpdu_start" name="start" interval="20s"/>
           </operations>
           <meta_attributes id="meta_attributes-requires">
             <nvpair id="nvpair-requires" name="requires" value="nothing"/>
           </meta_attributes>
           <instance_attributes id="stonith_rackpdu_ia">
             <nvpair id="stonith_rackpdu_ia_hostlist" name="hostlist" value="wc01 wc02"/>
             <nvpair id="stonith_rackpdu_ia_pduip" name="pduip" value="pdu02.r02.ipax.at"/>
             <nvpair id="stonith_rackpdu_ia_community" name="community" value="wc"/>
           </instance_attributes>
         </primitive>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc-drbd_www_likes_wc01" rsc="ms_drbd_www">
         <rule id="rule-drbd_www_likes_wc01" role="Master" score="100">
           <expression attribute="#uname" operation="eq" value="wc01" id="exp_drbd_www"/>
         </rule>
       </rsc_location>
       <rsc_location id="loc-drbd_mysql_likes_wc02" rsc="ms_drbd_mysql">
         <rule id="rule-drbd_mysql_likes_wc02" role="Master" score="100">
           <expression attribute="#uname" operation="eq" value="wc02" id="exp_drbd_msyql"/>
         </rule>
       </rsc_location>
       <rsc_order id="drbd_before_group_mysql" first="ms_drbd_mysql" then="group_mysql" then-action="start" first-action="promote"/>
       <rsc_order id="drbd_before_group_www_data" first="ms_drbd_www" then="group_www_data" then-action="start" first-action="promote"/>
       <rsc_order id="nfs-common_before_webservices" first="clone_nfs-common" then="clone_webservice" then-action="start" first-action="start"/>
       <rsc_order id="nfs-common_before_group_www_data" first="clone_nfs-common" then="group_www_data" then-action="start" first-action="start"/>
       <rsc_order id="webservices_before_group_ftpd" first="clone_webservice" then="group_ftpd" then-action="start" first-action="start"/>
       <rsc_order id="group_www_data_before_webservices" first="group_www_data" then="clone_webservice" then-action="start" first-action="start"/>
       <rsc_colocation id="colo_drbd_group_mysql" rsc="group_mysql" with-rsc="ms_drbd_mysql" with-rsc-role="Master" score="INFINITY"/>
       <rsc_colocation id="colo_drbd_group_www_data" rsc="group_www_data" with-rsc="ms_drbd_www" with-rsc-role="Master" score="INFINITY"/>
       <rsc_colocation id="colo_nfs-common_webservice" rsc="clone_webservice" with-rsc="clone_nfs-common" with-rsc-role="Started" score="INFINITY"/>
       <rsc_colocation id="colo_nfs-common_www_data" rsc="group_www_data" with-rsc="clone_nfs-common" with-rsc-role="Started" score="INFINITY"/>
       <rsc_colocation id="colo_webservices_group_ftpd" rsc="group_ftpd" with-rsc="clone_webservice" with-rsc-role="Started" score="INFINITY"/>
       <rsc_colocation id="colo_www_data_webservice" rsc="clone_webservice" with-rsc="group_www_data" with-rsc-role="Started" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca" uname="wc01" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <instance_attributes id="status-31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
           <nvpair id="status-31de4ab3-2d05-476e-8f9a-627ad6cd94ca-probe_complete" name="probe_complete" value="true"/>
         </instance_attributes>
         <instance_attributes id="master-31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
           <nvpair id="status-master-drbd_www:0-31de4ab3-2d05-476e-8f9a-627ad6cd94ca" name="master-drbd_www:0" value="75"/>
           <nvpair id="status-master-drbd_mysql:0-31de4ab3-2d05-476e-8f9a-627ad6cd94ca" name="master-drbd_mysql:0" value="75"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <lrm_resources>
           <lrm_resource id="pure-ftpd" type="Pure-FTPd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pure-ftpd_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="19:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;19:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="17" rc-code="7" op-status="0" interval="0" last-run="1227886634" last-rc-change="1227886634" exec-time="40" queue-time="3070" op-digest="e63b7266d3e1be8309080fdc00a2d60b"/>
             <lrm_rsc_op id="pure-ftpd_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="156:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;156:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="65" rc-code="0" op-status="0" interval="0" last-run="1227886766" last-rc-change="1227886766" exec-time="60" queue-time="0" op-digest="e63b7266d3e1be8309080fdc00a2d60b"/>
             <lrm_rsc_op id="pure-ftpd_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="157:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;157:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="66" rc-code="0" op-status="0" interval="10000" last-run="1227886766" last-rc-change="1227886766" exec-time="30" queue-time="0" op-digest="09bb5ef1676d1be79dbce1c537d3ad67"/>
             <lrm_rsc_op id="pure-ftpd_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="158:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;158:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="47" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="70" queue-time="0" op-digest="e63b7266d3e1be8309080fdc00a2d60b"/>
           </lrm_resource>
           <lrm_resource id="nfs-kernel-server" type="nfs-kernel-server" class="lsb">
             <lrm_rsc_op id="nfs-kernel-server_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="5:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;5:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1227886631" last-rc-change="1227886631" exec-time="40" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="nfs-kernel-server_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="18:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;18:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="52" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="40" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="nfs-kernel-server_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="20:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;20:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="55" rc-code="0" op-status="0" interval="0" last-run="1227886759" last-rc-change="1227886759" exec-time="60" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="extip_ftp" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="extip_ftp_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="18:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;18:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1227886634" last-rc-change="1227886634" exec-time="90" queue-time="3060" op-digest="0ddb77800f7cf1783e09074e57a1c92a"/>
             <lrm_rsc_op id="extip_ftp_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="154:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;154:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="63" rc-code="0" op-status="0" interval="0" last-run="1227886766" last-rc-change="1227886766" exec-time="70" queue-time="0" op-digest="0ddb77800f7cf1783e09074e57a1c92a"/>
             <lrm_rsc_op id="extip_ftp_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="155:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;155:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="64" rc-code="0" op-status="0" interval="30000" last-run="1227886766" last-rc-change="1227886766" exec-time="40" queue-time="0" op-digest="1a6694d09be75afdeac6fe048edc711d"/>
             <lrm_rsc_op id="extip_ftp_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="156:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;156:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="51" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="120" queue-time="0" op-digest="0ddb77800f7cf1783e09074e57a1c92a"/>
           </lrm_resource>
           <lrm_resource id="fs_www_data" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www_data_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="4:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;4:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1227886631" last-rc-change="1227886631" exec-time="90" queue-time="0" op-digest="e92e03ef74b3bd8ea3a1fb467461b0d6"/>
             <lrm_rsc_op id="fs_www_data_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="7:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;7:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="31" rc-code="0" op-status="0" interval="0" last-run="1227886639" last-rc-change="1227886639" exec-time="7770" queue-time="0" op-digest="e92e03ef74b3bd8ea3a1fb467461b0d6"/>
             <lrm_rsc_op id="fs_www_data_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="8:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;8:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="32" rc-code="0" op-status="0" interval="30000" last-run="1227886736" last-rc-change="1227886646" exec-time="50" queue-time="0" op-digest="61ba349282448cb9be5fbe55d951930b"/>
           </lrm_resource>
           <lrm_resource id="fs_mysql" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mysql_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="8:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;8:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1227886632" last-rc-change="1227886632" exec-time="100" queue-time="1010" op-digest="0fbd1ec9230f0702db45f6e711a2cb15"/>
           </lrm_resource>
           <lrm_resource id="fs_www:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="14:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;14:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1227886633" last-rc-change="1227886633" exec-time="100" queue-time="2030" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
             <lrm_rsc_op id="fs_www:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="104:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;104:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="36" rc-code="0" op-status="0" interval="0" last-run="1227886647" last-rc-change="1227886647" exec-time="120" queue-time="0" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
             <lrm_rsc_op id="fs_www:0_monitor_30000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="105:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;105:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="37" rc-code="0" op-status="0" interval="30000" last-run="1227886737" last-rc-change="1227886647" exec-time="40" queue-time="0" op-digest="19e3c4f8fa2281a3f17c9f97015c0e22"/>
           </lrm_resource>
           <lrm_resource id="drbd_mysql:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd_mysql:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="7:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;7:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1227886631" last-rc-change="1227886631" exec-time="120" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="17:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;17:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="21" rc-code="0" op-status="0" interval="10000" last-run="1227886746" last-rc-change="1227886636" exec-time="50" queue-time="0" op-digest="7be32e122628021d5f016b91102dc319"/>
             <lrm_rsc_op id="drbd_mysql:0_pre_notify_start_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="199:3:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;199:3:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="44" rc-code="0" op-status="0" interval="0" last-run="1227886751" last-rc-change="1227886751" exec-time="20" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:0_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="186:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;186:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="48" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="70" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:0_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="187:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;187:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="58" rc-code="0" op-status="0" interval="0" last-run="1227886760" last-rc-change="1227886760" exec-time="80" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
           </lrm_resource>
           <lrm_resource id="fs_www:1" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="16:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;16:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="14" rc-code="7" op-status="0" interval="0" last-run="1227886634" last-rc-change="1227886634" exec-time="120" queue-time="3060" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
           </lrm_resource>
           <lrm_resource id="nfs-common:0" type="nfs-common" class="lsb">
             <lrm_rsc_op id="nfs-common:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="12:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;12:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1227886633" last-rc-change="1227886633" exec-time="40" queue-time="2030" op-digest="289cb95fab2136bb993ce77a7eed36c1"/>
             <lrm_rsc_op id="nfs-common:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="77:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;77:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="22" rc-code="0" op-status="0" interval="10000" last-run="1227886745" last-rc-change="1227886635" exec-time="30" queue-time="0" op-digest="85da060a17e205063fb165127f495fd2"/>
           </lrm_resource>
           <lrm_resource id="intip_nfs" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="intip_nfs_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="6:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;6:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1227886631" last-rc-change="1227886631" exec-time="100" queue-time="0" op-digest="c3208e13a4bc298a98b6d487a511637a"/>
             <lrm_rsc_op id="intip_nfs_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="21:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;21:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="56" rc-code="0" op-status="0" interval="0" last-run="1227886759" last-rc-change="1227886759" exec-time="70" queue-time="0" op-digest="c3208e13a4bc298a98b6d487a511637a"/>
             <lrm_rsc_op id="intip_nfs_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="7:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;7:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="57" rc-code="0" op-status="0" interval="30000" last-run="1227886759" last-rc-change="1227886759" exec-time="60" queue-time="0" op-digest="adbaff7f4e7952d538a1380ecd1fda7f"/>
             <lrm_rsc_op id="intip_nfs_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="22:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;22:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="46" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="100" queue-time="10" op-digest="c3208e13a4bc298a98b6d487a511637a"/>
           </lrm_resource>
           <lrm_resource id="mysql-server" type="mysql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="mysql-server_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="10:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;10:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="8" rc-code="7" op-status="0" interval="0" last-run="1227886632" last-rc-change="1227886632" exec-time="40" queue-time="1020" op-digest="26580a6c90deabc1af4aacdcfe6a40db"/>
           </lrm_resource>
           <lrm_resource id="drbd_www:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd_www:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="11:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;11:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="9" rc-code="0" op-status="0" interval="0" last-run="1227886632" last-rc-change="1227886632" exec-time="100" queue-time="1020" op-digest="4ad5589700cc6650be8080df1872d5cf"/>
             <lrm_rsc_op id="drbd_www:0_promote_0" operation="promote" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="49:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;49:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="26" rc-code="0" op-status="0" interval="0" last-run="1227886635" last-rc-change="1227886635" exec-time="120" queue-time="0" op-digest="4ad5589700cc6650be8080df1872d5cf"/>
             <lrm_rsc_op id="drbd_www:0_post_notify_promote_0" operation="notify" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="182:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;182:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="27" rc-code="0" op-status="0" interval="0" last-run="1227886636" last-rc-change="1227886636" exec-time="90" queue-time="0" op-digest="4ad5589700cc6650be8080df1872d5cf"/>
             <lrm_rsc_op id="drbd_www:0_monitor_5000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="51:2:8:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:8;51:2:8:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="28" rc-code="8" op-status="0" interval="5000" last-run="1227886748" last-rc-change="1227886637" exec-time="40" queue-time="0" op-digest="12a2243bd26d528c5b07bf6255dd4a01"/>
             <lrm_rsc_op id="drbd_www:0_pre_notify_start_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="210:3:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;210:3:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="45" rc-code="0" op-status="0" interval="0" last-run="1227886751" last-rc-change="1227886751" exec-time="30" queue-time="0" op-digest="4ad5589700cc6650be8080df1872d5cf"/>
           </lrm_resource>
           <lrm_resource id="mysql-proxy:0" type="mysql-proxy" class="lsb">
             <lrm_rsc_op id="mysql-proxy:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="13:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;13:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="11" rc-code="0" op-status="0" interval="0" last-run="1227886633" last-rc-change="1227886633" exec-time="30" queue-time="2040" op-digest="03b5e1546e7c85e26d0a3d233850939e"/>
             <lrm_rsc_op id="mysql-proxy:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="92:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;92:1:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="23" rc-code="0" op-status="0" interval="10000" last-run="1227886745" last-rc-change="1227886635" exec-time="10" queue-time="0" op-digest="0382668273230ee3df9745274f788e64"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="15:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;15:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1227886633" last-rc-change="1227886633" exec-time="120" queue-time="2040" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
             <lrm_rsc_op id="apache2:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="106:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;106:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="38" rc-code="0" op-status="0" interval="0" last-run="1227886648" last-rc-change="1227886648" exec-time="1370" queue-time="0" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
             <lrm_rsc_op id="apache2:0_monitor_60000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="107:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;107:2:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="39" rc-code="0" op-status="0" interval="60000" last-run="1227886709" last-rc-change="1227886649" exec-time="80" queue-time="0" op-digest="1b75c4a9fbc23134ee4f0185fcc5be0d"/>
           </lrm_resource>
           <lrm_resource id="intip_sql" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="intip_sql_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="9:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;9:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="7" rc-code="7" op-status="0" interval="0" last-run="1227886632" last-rc-change="1227886632" exec-time="80" queue-time="1010" op-digest="67947dcd493e13bb18816838e534e27b"/>
           </lrm_resource>
           <lrm_resource id="apache2:1" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="17:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;17:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="15" rc-code="7" op-status="0" interval="0" last-run="1227886634" last-rc-change="1227886634" exec-time="150" queue-time="3060" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
           </lrm_resource>
           <lrm_resource id="stonith_rackpdu:0" type="external/rackpdu" class="stonith">
             <lrm_rsc_op id="stonith_rackpdu:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="20:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;20:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="18" rc-code="7" op-status="0" interval="0" last-run="1227886636" last-rc-change="1227886636" exec-time="0" queue-time="4080" op-digest="a7d889e947eddfa525c0e195cc52ad66"/>
             <lrm_rsc_op id="stonith_rackpdu:0_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="163:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;163:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="61" rc-code="0" op-status="0" interval="5000" last-run="1227886764" last-rc-change="1227886764" exec-time="1030" queue-time="0" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
             <lrm_rsc_op id="stonith_rackpdu:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="164:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;164:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="62" rc-code="0" op-status="0" interval="0" last-run="1227886765" last-rc-change="1227886765" exec-time="30" queue-time="1020" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
             <lrm_rsc_op id="stonith_rackpdu:0_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="162:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;162:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="59" rc-code="0" op-status="0" interval="0" last-run="1227886763" last-rc-change="1227886763" exec-time="0" queue-time="0" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
           </lrm_resource>
           <lrm_resource id="stonith_rackpdu:1" type="external/rackpdu" class="stonith">
             <lrm_rsc_op id="stonith_rackpdu:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0" transition-key="21:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;21:0:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="19" rc-code="7" op-status="0" interval="0" last-run="1227886636" last-rc-change="1227886636" exec-time="0" queue-time="4070" op-digest="a7d889e947eddfa525c0e195cc52ad66"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="f36760d8-d84a-46b2-b452-4c8cac8b3396" uname="wc02" ha="active" join="member" crm-debug-origin="do_update_resource" crmd="online" shutdown="0" in_ccm="true" expected="member">
       <lrm id="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <lrm_resources>
           <lrm_resource id="nfs-kernel-server" type="nfs-kernel-server" class="lsb">
             <lrm_rsc_op id="nfs-kernel-server_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="17:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;17:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="3" rc-code="0" op-status="0" interval="0" last-run="1227886752" last-rc-change="1227886752" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="nfs-kernel-server_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="19:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;19:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="25" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
           </lrm_resource>
           <lrm_resource id="nfs-common:1" type="nfs-common" class="lsb">
             <lrm_rsc_op id="nfs-common:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="24:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;24:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="10" rc-code="0" op-status="0" interval="0" last-run="1227886752" last-rc-change="1227886752" exec-time="20" queue-time="0" op-digest="289cb95fab2136bb993ce77a7eed36c1"/>
             <lrm_rsc_op id="nfs-common:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="109:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;109:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="21" rc-code="0" op-status="0" interval="10000" last-run="1227886757" last-rc-change="1227886757" exec-time="20" queue-time="0" op-digest="85da060a17e205063fb165127f495fd2"/>
           </lrm_resource>
           <lrm_resource id="drbd_mysql:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd_mysql:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="19:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;19:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="5" rc-code="0" op-status="0" interval="0" last-run="1227886752" last-rc-change="1227886752" exec-time="70" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:1_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="194:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;194:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="23" rc-code="0" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="10" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:1_promote_0" operation="promote" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="33:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;33:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="26" rc-code="0" op-status="0" interval="0" last-run="1227886758" last-rc-change="1227886758" exec-time="40" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:1_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="195:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;195:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="30" rc-code="0" op-status="0" interval="0" last-run="1227886760" last-rc-change="1227886760" exec-time="1030" queue-time="0" op-digest="ecb91fd379f3136f8656674e7e0e32aa"/>
             <lrm_rsc_op id="drbd_mysql:1_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="35:5:8:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:8;35:5:8:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="31" rc-code="8" op-status="0" interval="5000" last-run="1227886762" last-rc-change="1227886762" exec-time="50" queue-time="0" op-digest="7be32e122628021d5f016b91102dc319"/>
           </lrm_resource>
           <lrm_resource id="fs_www_data" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www_data_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="16:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;16:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1227886752" last-rc-change="1227886752" exec-time="90" queue-time="0" op-digest="e92e03ef74b3bd8ea3a1fb467461b0d6"/>
           </lrm_resource>
           <lrm_resource id="intip_nfs" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="intip_nfs_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="18:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;18:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1227886752" last-rc-change="1227886752" exec-time="90" queue-time="0" op-digest="c3208e13a4bc298a98b6d487a511637a"/>
           </lrm_resource>
           <lrm_resource id="mysql-server" type="mysql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="mysql-server_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="22:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;22:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="8" rc-code="7" op-status="0" interval="0" last-run="1227886753" last-rc-change="1227886753" exec-time="40" queue-time="1010" op-digest="26580a6c90deabc1af4aacdcfe6a40db"/>
             <lrm_rsc_op id="mysql-server_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="64:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;64:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="40" rc-code="0" op-status="0" interval="0" last-run="1227886765" last-rc-change="1227886765" exec-time="4100" queue-time="0" op-digest="26580a6c90deabc1af4aacdcfe6a40db"/>
             <lrm_rsc_op id="mysql-server_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="65:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;65:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="44" rc-code="0" op-status="0" interval="30000" last-run="1227886770" last-rc-change="1227886770" exec-time="10" queue-time="0" op-digest="98db6296f5a56bd27b87c236e88e0f48"/>
           </lrm_resource>
           <lrm_resource id="drbd_www:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="drbd_www:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="23:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;23:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="9" rc-code="0" op-status="0" interval="0" last-run="1227886753" last-rc-change="1227886753" exec-time="60" queue-time="1010" op-digest="4ad5589700cc6650be8080df1872d5cf"/>
             <lrm_rsc_op id="drbd_www:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="76:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;76:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="20" rc-code="0" op-status="0" interval="10000" last-run="1227886757" last-rc-change="1227886757" exec-time="40" queue-time="0" op-digest="12a2243bd26d528c5b07bf6255dd4a01"/>
           </lrm_resource>
           <lrm_resource id="intip_sql" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="intip_sql_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="21:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;21:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="7" rc-code="7" op-status="0" interval="0" last-run="1227886753" last-rc-change="1227886753" exec-time="60" queue-time="1010" op-digest="67947dcd493e13bb18816838e534e27b"/>
             <lrm_rsc_op id="intip_sql_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="62:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;62:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="38" rc-code="0" op-status="0" interval="0" last-run="1227886764" last-rc-change="1227886764" exec-time="50" queue-time="0" op-digest="67947dcd493e13bb18816838e534e27b"/>
             <lrm_rsc_op id="intip_sql_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="63:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;63:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="39" rc-code="0" op-status="0" interval="30000" last-run="1227886765" last-rc-change="1227886765" exec-time="40" queue-time="0" op-digest="1c158e005c25523bfe6dc492dcebd79a"/>
           </lrm_resource>
           <lrm_resource id="fs_mysql" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mysql_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="20:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;20:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="6" rc-code="7" op-status="0" interval="0" last-run="1227886753" last-rc-change="1227886753" exec-time="70" queue-time="1010" op-digest="0fbd1ec9230f0702db45f6e711a2cb15"/>
             <lrm_rsc_op id="fs_mysql_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="60:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;60:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="32" rc-code="0" op-status="0" interval="0" last-run="1227886762" last-rc-change="1227886762" exec-time="1600" queue-time="0" op-digest="0fbd1ec9230f0702db45f6e711a2cb15"/>
             <lrm_rsc_op id="fs_mysql_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="61:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;61:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="37" rc-code="0" op-status="0" interval="30000" last-run="1227886764" last-rc-change="1227886764" exec-time="50" queue-time="0" op-digest="1a6f915fbc4052fd180914e3bd3b369f"/>
           </lrm_resource>
           <lrm_resource id="mysql-proxy:1" type="mysql-proxy" class="lsb">
             <lrm_rsc_op id="mysql-proxy:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="25:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;25:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="11" rc-code="0" op-status="0" interval="0" last-run="1227886754" last-rc-change="1227886754" exec-time="20" queue-time="2000" op-digest="03b5e1546e7c85e26d0a3d233850939e"/>
             <lrm_rsc_op id="mysql-proxy:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="126:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;126:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="22" rc-code="0" op-status="0" interval="10000" last-run="1227886757" last-rc-change="1227886757" exec-time="20" queue-time="0" op-digest="0382668273230ee3df9745274f788e64"/>
           </lrm_resource>
           <lrm_resource id="fs_www:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="26:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;26:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="12" rc-code="7" op-status="0" interval="0" last-run="1227886754" last-rc-change="1227886754" exec-time="50" queue-time="2010" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
           </lrm_resource>
           <lrm_resource id="fs_www:1" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_www:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="28:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;28:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="14" rc-code="7" op-status="0" interval="0" last-run="1227886754" last-rc-change="1227886754" exec-time="60" queue-time="2010" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
             <lrm_rsc_op id="fs_www:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="143:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;143:4:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="29" rc-code="0" op-status="0" interval="0" last-run="1227886759" last-rc-change="1227886759" exec-time="80" queue-time="0" op-digest="0257f9c18aebf3a4f5c134893f38b146"/>
             <lrm_rsc_op id="fs_www:1_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="143:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;143:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="33" rc-code="0" op-status="0" interval="30000" last-run="1227886762" last-rc-change="1227886762" exec-time="80" queue-time="0" op-digest="19e3c4f8fa2281a3f17c9f97015c0e22"/>
           </lrm_resource>
           <lrm_resource id="apache2:0" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="27:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;27:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="13" rc-code="7" op-status="0" interval="0" last-run="1227886754" last-rc-change="1227886754" exec-time="250" queue-time="2010" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
           </lrm_resource>
           <lrm_resource id="stonith_rackpdu:0" type="external/rackpdu" class="stonith">
             <lrm_rsc_op id="stonith_rackpdu:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="32:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;32:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="18" rc-code="7" op-status="0" interval="0" last-run="1227886756" last-rc-change="1227886756" exec-time="0" queue-time="3030" op-digest="a7d889e947eddfa525c0e195cc52ad66"/>
           </lrm_resource>
           <lrm_resource id="pure-ftpd" type="Pure-FTPd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pure-ftpd_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="31:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;31:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="17" rc-code="7" op-status="0" interval="0" last-run="1227886755" last-rc-change="1227886755" exec-time="10" queue-time="3030" op-digest="e63b7266d3e1be8309080fdc00a2d60b"/>
           </lrm_resource>
           <lrm_resource id="extip_ftp" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="extip_ftp_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="30:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;30:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1227886755" last-rc-change="1227886755" exec-time="30" queue-time="3030" op-digest="0ddb77800f7cf1783e09074e57a1c92a"/>
           </lrm_resource>
           <lrm_resource id="apache2:1" type="apache" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="apache2:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="29:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;29:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="15" rc-code="7" op-status="0" interval="0" last-run="1227886755" last-rc-change="1227886755" exec-time="60" queue-time="3020" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
             <lrm_rsc_op id="apache2:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="144:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;144:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="34" rc-code="0" op-status="0" interval="0" last-run="1227886763" last-rc-change="1227886763" exec-time="2950" queue-time="0" op-digest="e4466c65b7015cba266e0692e8915cfd"/>
             <lrm_rsc_op id="apache2:1_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="145:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;145:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="43" rc-code="0" op-status="0" interval="60000" last-run="1227886766" last-rc-change="1227886766" exec-time="60" queue-time="0" op-digest="1b75c4a9fbc23134ee4f0185fcc5be0d"/>
           </lrm_resource>
           <lrm_resource id="stonith_rackpdu:1" type="external/rackpdu" class="stonith">
             <lrm_rsc_op id="stonith_rackpdu:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="33:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:7;33:3:7:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="19" rc-code="7" op-status="0" interval="0" last-run="1227886757" last-rc-change="1227886757" exec-time="0" queue-time="4040" op-digest="a7d889e947eddfa525c0e195cc52ad66"/>
             <lrm_rsc_op id="stonith_rackpdu:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="167:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;167:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="42" rc-code="0" op-status="0" interval="0" last-run="1227886766" last-rc-change="1227886766" exec-time="40" queue-time="30" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
             <lrm_rsc_op id="stonith_rackpdu:1_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="166:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;166:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="41" rc-code="0" op-status="0" interval="5000" last-run="1227886766" last-rc-change="1227886766" exec-time="30" queue-time="0" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
             <lrm_rsc_op id="stonith_rackpdu:1_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0" transition-key="165:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" transition-magic="0:0;165:5:0:59011895-0f92-4d2f-8397-d657ffe06c71" call-id="35" rc-code="0" op-status="0" interval="0" last-run="1227886763" last-rc-change="1227886763" exec-time="10" queue-time="1020" op-digest="c3ac995d0635bdd6516b948af0dc9176"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <instance_attributes id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396">
           <nvpair id="status-f36760d8-d84a-46b2-b452-4c8cac8b3396-probe_complete" name="probe_complete" value="true"/>
         </instance_attributes>
         <instance_attributes id="master-f36760d8-d84a-46b2-b452-4c8cac8b3396">
           <nvpair id="status-master-drbd_mysql:1-f36760d8-d84a-46b2-b452-4c8cac8b3396" name="master-drbd_mysql:1" value="75"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>