Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP1:Update
pacemaker.14850
pacemaker-XML-upgrade-2.10.xsl-re-apply-on-sche...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-XML-upgrade-2.10.xsl-re-apply-on-scheduler-CTS-test-cases.patch of Package pacemaker.14850
commit f35813d53e4da9b17cc0ac5e89ff72b586d042ec Author: Jan Pokorný <jpokorny@redhat.com> Date: Mon May 14 18:12:30 2018 +0200 XML: upgrade-2.10.xsl: re-apply on scheduler CTS test cases cts/pengine/order-expired-failure.xml + cts/pengine/notifs-for-unrunnable.xml: bump the validate-with field rest: let upgrade-2.10.xsl drop ballast meta_attribute elements diff --git a/cts/pengine/1360.xml b/cts/pengine/1360.xml index fe6ede3bb..7f1e83a8a 100644 --- a/cts/pengine/1360.xml +++ b/cts/pengine/1360.xml @@ -17,14 +17,11 @@ <nvpair id="nvpair.id21896" name="nic" value="eth0"/> <nvpair id="nvpair.id21905" name="lvs_support" value="true"/> </instance_attributes> - <meta_attributes id="primitive-VIP.meta"/> </primitive> <meta_attributes id="group-ClusterAlias.meta"/> </group> <clone id="dolly"> - <primitive id="dollies" class="ocf" type="clone_server" provider="gn1"> - <meta_attributes id="primitive-dollies.meta"/> - </primitive> + <primitive id="dollies" class="ocf" type="clone_server" provider="gn1"/> <meta_attributes id="clone-dolly.meta"> <nvpair id="nvpair.meta.auto-42" name="resource-stickiness" value="0"/> <nvpair id="nvpair.meta.auto-40" name="clone-max" value="1"/> diff --git a/cts/pengine/594.xml b/cts/pengine/594.xml index be4078d8f..4dc709a46 100644 --- a/cts/pengine/594.xml +++ b/cts/pengine/594.xml @@ -23,7 +23,6 @@ <instance_attributes id="instance_attributes.id21956"> <nvpair id="nvpair.id21962" name="ip" value="127.0.0.10"/> </instance_attributes> - <meta_attributes id="primitive-DcIPaddr.meta"/> </primitive> <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -32,7 +31,6 @@ <instance_attributes id="instance_attributes.id21997"> <nvpair id="nvpair.id22003" name="ip" value="127.0.0.21"/> </instance_attributes> - <meta_attributes id="primitive-rsc_hadev3.meta"/> </primitive> <primitive id="rsc_hadev2" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -41,7 +39,6 @@ <instance_attributes id="instance_attributes.id22038"> <nvpair id="nvpair.id22044" name="ip" value="127.0.0.22"/> </instance_attributes> - <meta_attributes id="primitive-rsc_hadev2.meta"/> </primitive> <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -50,7 +47,6 @@ <instance_attributes id="instance_attributes.id22079"> <nvpair id="nvpair.id22085" name="ip" value="127.0.0.23"/> </instance_attributes> - <meta_attributes id="primitive-rsc_hadev1.meta"/> </primitive> <clone id="DoFencing"> <primitive id="child_DoFencing" class="stonith" type="ssh"> @@ -60,7 +56,6 @@ <instance_attributes id="instance_attributes.id22155"> <nvpair id="nvpair.id22161" name="hostlist" value="hadev3 hadev2 hadev1 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="nvpair.meta.auto-107" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/662.xml b/cts/pengine/662.xml index 7377f9f9f..5ad27da3b 100644 --- a/cts/pengine/662.xml +++ b/cts/pengine/662.xml @@ -23,7 +23,6 @@ <instance_attributes id="instance_attributes.id21954"> <nvpair id="nvpair.id21961" name="ip" value="127.0.0.10"/> </instance_attributes> - <meta_attributes id="primitive-DcIPaddr.meta"/> </primitive> <primitive id="rsc_c001n09" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -32,7 +31,6 @@ <instance_attributes id="instance_attributes.id21996"> <nvpair id="nvpair.id22002" name="ip" value="127.0.0.11"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n09.meta"/> </primitive> <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -41,7 +39,6 @@ <instance_attributes id="instance_attributes.id22037"> <nvpair id="nvpair.id22043" name="ip" value="127.0.0.12"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n02.meta"/> </primitive> <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -50,7 +47,6 @@ <instance_attributes id="instance_attributes.id22077"> <nvpair id="nvpair.id22084" name="ip" value="127.0.0.13"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n03.meta"/> </primitive> <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -59,7 +55,6 @@ <instance_attributes id="instance_attributes.id22118"> <nvpair id="nvpair.id22124" name="ip" value="127.0.0.14"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n04.meta"/> </primitive> <clone id="DoFencing"> <primitive id="child_DoFencing" class="stonith" type="ssh"> @@ -69,7 +64,6 @@ <instance_attributes id="instance_attributes.id22194"> <nvpair id="nvpair.id22201" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="nvpair.meta.auto-123" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/696.xml b/cts/pengine/696.xml index 86a6cfbc1..a6572377b 100644 --- a/cts/pengine/696.xml +++ b/cts/pengine/696.xml @@ -67,7 +67,6 @@ <instance_attributes id="instance_attributes.id22152"> <nvpair id="nvpair.id22158" name="hostlist" value="hadev1 hadev2 hadev3 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="nvpair.meta.auto-105" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/994-2.xml b/cts/pengine/994-2.xml index cae692560..9972ef5c8 100644 --- a/cts/pengine/994-2.xml +++ b/cts/pengine/994-2.xml @@ -22,7 +22,6 @@ <instance_attributes id="instance_attributes.id21919"> <nvpair id="nvpair.id21925" name="1" value="r0"/> </instance_attributes> - <meta_attributes id="primitive-datadisk_1.meta"/> </primitive> <primitive id="Filesystem_2" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -33,7 +32,6 @@ <nvpair id="nvpair.id21976" name="directory" value="/home"/> <nvpair id="nvpair.id21985" name="fstype" value="reiserfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_2.meta"/> </primitive> <primitive id="IPaddr_5" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -42,19 +40,15 @@ <instance_attributes id="instance_attributes.id22021"> <nvpair id="nvpair.id22027" name="ip" value="10.10.10.222"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_5.meta"/> </primitive> <primitive id="postfix_9" class="lsb" type="postfix"> <operations> <op name="monitor" interval="120s" id="postfix_9_mon" timeout="60s"/> </operations> - <meta_attributes id="primitive-postfix_9.meta"/> </primitive> <meta_attributes id="group-group_1.meta"/> </group> - <primitive id="depends" class="lsb" type="postfix"> - <meta_attributes id="primitive-depends.meta"/> - </primitive> + <primitive id="depends" class="lsb" type="postfix"/> </resources> <constraints> <rsc_order id="o-1" first="group_1" then="depends" then-action="start" first-action="start" score="INFINITY"/> diff --git a/cts/pengine/994.xml b/cts/pengine/994.xml index 8dcc0fda0..40bb1c9ef 100644 --- a/cts/pengine/994.xml +++ b/cts/pengine/994.xml @@ -22,7 +22,6 @@ <instance_attributes id="instance_attributes.id21919"> <nvpair id="nvpair.id21925" name="1" value="r0"/> </instance_attributes> - <meta_attributes id="primitive-datadisk_1.meta"/> </primitive> <primitive id="Filesystem_2" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -33,7 +32,6 @@ <nvpair id="nvpair.id21976" name="directory" value="/home"/> <nvpair id="nvpair.id21985" name="fstype" value="reiserfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_2.meta"/> </primitive> <primitive id="IPaddr_5" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -42,13 +40,11 @@ <instance_attributes id="instance_attributes.id22021"> <nvpair id="nvpair.id22027" name="ip" value="10.10.10.222"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_5.meta"/> </primitive> <primitive id="postfix_9" class="lsb" type="postfix"> <operations> <op name="monitor" interval="120s" id="postfix_9_mon" timeout="60s"/> </operations> - <meta_attributes id="primitive-postfix_9.meta"/> </primitive> <meta_attributes id="group-group_1.meta"/> </group> diff --git a/cts/pengine/asymmetric.xml b/cts/pengine/asymmetric.xml index 19e8a25ff..8f1d17237 100644 --- a/cts/pengine/asymmetric.xml +++ b/cts/pengine/asymmetric.xml @@ -58,7 +58,6 @@ <op name="monitor" interval="20s" id="ed238e4a-f523-49f9-889a-d8e81a74ff81" timeout="10s" role="Master"/> <op name="monitor" interval="19s" id="op.auto-2" timeout="10s" role="Slave"/> </operations> - <meta_attributes id="primitive-ebe3fb6e-7778-426e-be58-190ab1ff3dd3.meta"/> </primitive> <meta_attributes id="clone-ms_drbd_poolA.meta"/> </clone> diff --git a/cts/pengine/attrs1.xml b/cts/pengine/attrs1.xml index 770c2240d..7276bda25 100644 --- a/cts/pengine/attrs1.xml +++ b/cts/pengine/attrs1.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs2.xml b/cts/pengine/attrs2.xml index 05fe62ed3..a26e7e94a 100644 --- a/cts/pengine/attrs2.xml +++ b/cts/pengine/attrs2.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs3.xml b/cts/pengine/attrs3.xml index 5a30cffca..500d54017 100644 --- a/cts/pengine/attrs3.xml +++ b/cts/pengine/attrs3.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs4.xml b/cts/pengine/attrs4.xml index e99295497..12a2955f3 100644 --- a/cts/pengine/attrs4.xml +++ b/cts/pengine/attrs4.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs5.xml b/cts/pengine/attrs5.xml index c0bc0e23d..20cba780c 100644 --- a/cts/pengine/attrs5.xml +++ b/cts/pengine/attrs5.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs6.xml b/cts/pengine/attrs6.xml index 957d74e16..2924643ed 100644 --- a/cts/pengine/attrs6.xml +++ b/cts/pengine/attrs6.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs7.xml b/cts/pengine/attrs7.xml index e46e88ae6..41ae6ae69 100644 --- a/cts/pengine/attrs7.xml +++ b/cts/pengine/attrs7.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/attrs8.xml b/cts/pengine/attrs8.xml index 01c42a242..8578bb633 100644 --- a/cts/pengine/attrs8.xml +++ b/cts/pengine/attrs8.xml @@ -13,9 +13,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/bug-1572-1.xml b/cts/pengine/bug-1572-1.xml index fe9516eea..870f7cdac 100644 --- a/cts/pengine/bug-1572-1.xml +++ b/cts/pengine/bug-1572-1.xml @@ -45,7 +45,6 @@ <operations> <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/> </operations> - <meta_attributes id="primitive-rsc_drbd_7788.meta"/> </primitive> <meta_attributes id="clone-ms_drbd_7788.meta"> <nvpair id="notify.meta.auto-82" name="promotable" value="true"/> @@ -67,7 +66,6 @@ <nvpair id="nvpair.id22252" name="fstype" value="ext3"/> <nvpair id="nvpair.id22260" name="notify" value="true"/> </instance_attributes> - <meta_attributes id="primitive-fs_mirror.meta"/> </primitive> <instance_attributes id="instance_attributes.id22272"/> <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat"> @@ -83,7 +81,6 @@ <operations> <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/> </operations> - <meta_attributes id="primitive-pgsql_5555.meta"/> </primitive> <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -92,7 +89,6 @@ <instance_attributes id="instance_attributes.id22408"> <nvpair id="nvpair.id22415" name="ip" value="147.81.84.133"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_147_81_84_133.meta"/> </primitive> <meta_attributes id="group-grp_pgsql_mirror.meta"> <nvpair id="ordered.meta.auto-118" name="ordered" value="true"/> diff --git a/cts/pengine/bug-1572-2.xml b/cts/pengine/bug-1572-2.xml index 4e9010294..b5bc841ce 100644 --- a/cts/pengine/bug-1572-2.xml +++ b/cts/pengine/bug-1572-2.xml @@ -39,7 +39,6 @@ <operations> <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/> </operations> - <meta_attributes id="primitive-rsc_drbd_7788.meta"/> </primitive> <meta_attributes id="clone-ms_drbd_7788.meta"> <nvpair id="notify.meta.auto-74" name="promotable" value="true"/> @@ -61,7 +60,6 @@ <nvpair id="nvpair.id22214" name="fstype" value="ext3"/> <nvpair id="nvpair.id22223" name="notify" value="true"/> </instance_attributes> - <meta_attributes id="primitive-fs_mirror.meta"/> </primitive> <instance_attributes id="instance_attributes.id22234"/> <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat"> @@ -77,7 +75,6 @@ <operations> <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/> </operations> - <meta_attributes id="primitive-pgsql_5555.meta"/> </primitive> <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -86,7 +83,6 @@ <instance_attributes id="instance_attributes.id22371"> <nvpair id="nvpair.id22377" name="ip" value="147.81.84.133"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_147_81_84_133.meta"/> </primitive> <meta_attributes id="group-grp_pgsql_mirror.meta"> <nvpair id="ordered.meta.auto-110" name="ordered" value="true"/> diff --git a/cts/pengine/bug-1573.xml b/cts/pengine/bug-1573.xml index 415f0e87e..42600b6ea 100644 --- a/cts/pengine/bug-1573.xml +++ b/cts/pengine/bug-1573.xml @@ -32,7 +32,6 @@ <instance_attributes id="instance_attributes.id22035"> <nvpair id="nvpair.id22042" name="ip" value="192.168.1.101"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_101.meta"/> </primitive> <primitive id="apache_2" class="ocf" provider="heartbeat" type="apache"> <operations> @@ -41,7 +40,6 @@ <instance_attributes id="instance_attributes.id22078"> <nvpair id="nvpair.id22084" name="configfile" value="/etc/apache2/apache2.conf"/> </instance_attributes> - <meta_attributes id="primitive-apache_2.meta"/> </primitive> <meta_attributes id="group-group_1.meta"/> </group> @@ -53,7 +51,6 @@ <instance_attributes id="instance_attributes.id22126"> <nvpair id="nvpair.id22133" name="ip" value="192.168.1.102"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_102.meta"/> </primitive> <primitive id="apache_6" class="ocf" provider="heartbeat" type="apache"> <operations> diff --git a/cts/pengine/bug-1685.xml b/cts/pengine/bug-1685.xml index 9bea7eb02..a6d84b398 100644 --- a/cts/pengine/bug-1685.xml +++ b/cts/pengine/bug-1685.xml @@ -41,7 +41,6 @@ <instance_attributes id="instance_attributes.id22087"> <nvpair id="nvpair.id22094" name="drbd_resource" value="sip-shared"/> </instance_attributes> - <meta_attributes id="primitive-prim_shared_storage.meta"/> </primitive> <meta_attributes id="clone-shared_storage.meta"/> </clone> @@ -54,7 +53,6 @@ <nvpair id="nvpair.id22147" name="directory" value="/shared"/> <nvpair id="nvpair.id22156" name="fstype" value="reiserfs"/> </instance_attributes> - <meta_attributes id="primitive-shared_filesystem.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/bug-1765.xml b/cts/pengine/bug-1765.xml index 522b82d90..ce29e9ee0 100644 --- a/cts/pengine/bug-1765.xml +++ b/cts/pengine/bug-1765.xml @@ -45,7 +45,6 @@ <meta_attributes id="meta_attributes.id22075"> <nvpair id="nvpair.id22082" name="target-role" value="started"/> </meta_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> @@ -72,7 +71,6 @@ <meta_attributes id="meta_attributes.id22228"> <nvpair id="nvpair.id22234" name="target-role" value="started"/> </meta_attributes> - <meta_attributes id="primitive-drbd1.meta"/> </primitive> <meta_attributes id="clone-ms-drbd1.meta"/> </clone> diff --git a/cts/pengine/bug-1820-1.xml b/cts/pengine/bug-1820-1.xml index f4f38ee9b..b5c3f8c92 100644 --- a/cts/pengine/bug-1820-1.xml +++ b/cts/pengine/bug-1820-1.xml @@ -15,9 +15,7 @@ <node id="e4603bf6-d10f-4af2-b53b-ba72de6164d0" uname="world" type="member"/> </nodes> <resources> - <primitive id="p1" class="ocf" type="Xen" provider="heartbeat"> - <meta_attributes id="primitive-p1.meta"/> - </primitive> + <primitive id="p1" class="ocf" type="Xen" provider="heartbeat"/> <group id="gr1"> <primitive id="test1" class="ocf" type="Xen" provider="heartbeat"> <instance_attributes id="instance_attributes.id21929"> diff --git a/cts/pengine/bug-1822.xml b/cts/pengine/bug-1822.xml index 44e505ded..bc7c56c18 100644 --- a/cts/pengine/bug-1822.xml +++ b/cts/pengine/bug-1822.xml @@ -54,7 +54,6 @@ <instance_attributes id="instance_attributes.id22215"> <nvpair id="nvpair.id22222" name="sleep_time" value="10000"/> </instance_attributes> - <meta_attributes id="primitive-master_slave_Stateful.meta"/> </primitive> <primitive id="master_slave_procdctl" class="ocf" type="procdctl" provider="heartbeat"> <operations> @@ -65,7 +64,6 @@ <instance_attributes id="instance_attributes.id22281"> <nvpair id="nvpair.id22288" name="procd" value="sleep 10000"/> </instance_attributes> - <meta_attributes id="primitive-master_slave_procdctl.meta"/> </primitive> <meta_attributes id="group-ms-sf_group.meta"/> </group> diff --git a/cts/pengine/bug-5014-GROUP-A-stopped-B-started.xml b/cts/pengine/bug-5014-GROUP-A-stopped-B-started.xml index bc1a51024..2b65741fe 100644 --- a/cts/pengine/bug-5014-GROUP-A-stopped-B-started.xml +++ b/cts/pengine/bug-5014-GROUP-A-stopped-B-started.xml @@ -21,7 +21,6 @@ <operations> <op id="ClusterIP-monitor-30s" interval="30s" name="monitor"/> </operations> - <meta_attributes id="ClusterIP-meta_attributes"/> </primitive> <meta_attributes id="group1-meta_attributes"> <nvpair id="group1-meta_attributes-target-role" name="target-role" value="Stopped"/> @@ -36,7 +35,6 @@ <operations> <op id="ClusterIP2-monitor-30s" interval="30s" name="monitor"/> </operations> - <meta_attributes id="ClusterIP2-meta_attributes"/> </primitive> <meta_attributes id="group2-meta_attributes"> <nvpair id="group2-meta_attributes-target-role" name="target-role" value="Started"/> diff --git a/cts/pengine/bug-5025-1.xml b/cts/pengine/bug-5025-1.xml index 9255a2193..170a5b239 100644 --- a/cts/pengine/bug-5025-1.xml +++ b/cts/pengine/bug-5025-1.xml @@ -25,7 +25,6 @@ </instance_attributes> </primitive> <primitive class="ocf" id="A" provider="pacemaker" type="Dummy"> - <meta_attributes id="A-meta_attributes"/> <instance_attributes id="A-instance_attributes"> <nvpair id="A-instance_attributes-allow-migrate" name="allow-migrate" value="1"/> </instance_attributes> diff --git a/cts/pengine/bug-5025-2.xml b/cts/pengine/bug-5025-2.xml index ecc9323f8..f7fc3df87 100644 --- a/cts/pengine/bug-5025-2.xml +++ b/cts/pengine/bug-5025-2.xml @@ -25,7 +25,6 @@ </instance_attributes> </primitive> <primitive class="ocf" id="A" provider="pacemaker" type="Dummy"> - <meta_attributes id="A-meta_attributes"/> <instance_attributes id="A-instance_attributes"> <nvpair id="A-instance_attributes-target-role" name="target-role" value="started"/> <nvpair id="A-instance_attributes-allow-migrate" name="allow-migrate" value="1"/> diff --git a/cts/pengine/bug-5025-3.xml b/cts/pengine/bug-5025-3.xml index 2e825308c..1b6782ff8 100644 --- a/cts/pengine/bug-5025-3.xml +++ b/cts/pengine/bug-5025-3.xml @@ -25,7 +25,6 @@ </instance_attributes> </primitive> <primitive class="ocf" id="A" provider="pacemaker" type="Dummy"> - <meta_attributes id="A-meta_attributes"/> <instance_attributes id="A-instance_attributes"> <nvpair id="A-instance_attributes-target-role" name="target-role" value="started"/> <nvpair id="A-instance_attributes-state" name="state" value="anywhere"/> diff --git a/cts/pengine/bug-lf-1852.xml b/cts/pengine/bug-lf-1852.xml index 05ba8030b..7d543382e 100644 --- a/cts/pengine/bug-lf-1852.xml +++ b/cts/pengine/bug-lf-1852.xml @@ -41,7 +41,6 @@ <instance_attributes id="instance_attributes.id22015"> <nvpair id="nvpair.id22022" name="drbd_resource" value="r0"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> @@ -55,17 +54,13 @@ <nvpair id="nvpair.id22081" name="directory" value="/drbd"/> <nvpair id="nvpair.id22089" name="device" value="/dev/drbd0"/> </instance_attributes> - <meta_attributes id="primitive-fs0.meta"/> - </primitive> - <primitive id="mysqlid" class="lsb" type="mysql"> - <meta_attributes id="primitive-mysqlid.meta"/> </primitive> + <primitive id="mysqlid" class="lsb" type="mysql"/> <primitive id="ip_resource" class="ocf" type="IPaddr2" provider="heartbeat"> <instance_attributes id="instance_attributes.id22120"> <nvpair name="ip" value="192.168.0.215" id="nvpair.id22126"/> <nvpair name="nic" value="eth0" id="nvpair.id22135"/> </instance_attributes> - <meta_attributes id="primitive-ip_resource.meta"/> </primitive> <meta_attributes id="group-fs_mysql_ip.meta"/> </group> diff --git a/cts/pengine/bug-lf-1920.xml b/cts/pengine/bug-lf-1920.xml index 17395d13c..6117e1c50 100644 --- a/cts/pengine/bug-lf-1920.xml +++ b/cts/pengine/bug-lf-1920.xml @@ -26,7 +26,6 @@ <operations> <op name="monitor" interval="30s" id="op-mysql-1" timeout="20s"/> </operations> - <meta_attributes id="primitive-mysql-bin.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/bug-lf-2453.xml b/cts/pengine/bug-lf-2453.xml index 588e6378f..c06ca1c8c 100644 --- a/cts/pengine/bug-lf-2453.xml +++ b/cts/pengine/bug-lf-2453.xml @@ -38,7 +38,6 @@ <instance_attributes id="Apache-instance_attributes"> <nvpair id="Apache-instance_attributes-configfile" name="configfile" value="/etc/apache2/httpd.conf"/> </instance_attributes> - <meta_attributes id="apache-meta_attributes"/> </primitive> </clone> <clone id="CloneResource2"> diff --git a/cts/pengine/bug-n-385265-2.xml b/cts/pengine/bug-n-385265-2.xml index fd72e5695..1902c99fe 100644 --- a/cts/pengine/bug-n-385265-2.xml +++ b/cts/pengine/bug-n-385265-2.xml @@ -37,7 +37,6 @@ <operations> <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c8" timeout="25s" start-delay="120s"/> </operations> - <meta_attributes id="primitive-resource_idvscommon.meta"/> </primitive> <meta_attributes id="group-group_common.meta"> <nvpair id="ordered.meta.auto-27" name="ordered" value="true"/> diff --git a/cts/pengine/bug-n-385265.xml b/cts/pengine/bug-n-385265.xml index aa8d70c32..5f25718d6 100644 --- a/cts/pengine/bug-n-385265.xml +++ b/cts/pengine/bug-n-385265.xml @@ -37,7 +37,6 @@ <operations> <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c8" timeout="25s" start-delay="120s"/> </operations> - <meta_attributes id="primitive-resource_idvscommon.meta"/> </primitive> <meta_attributes id="group-group_common.meta"> <nvpair id="ordered.meta.auto-27" name="ordered" value="true"/> diff --git a/cts/pengine/bug-n-387749.xml b/cts/pengine/bug-n-387749.xml index 5cba84843..229a97d82 100644 --- a/cts/pengine/bug-n-387749.xml +++ b/cts/pengine/bug-n-387749.xml @@ -45,7 +45,6 @@ <nvpair id="nvpair.id22072" name="fstype" value="ocfs2"/> <nvpair name="options" id="nvpair.id22081" value="rw,sync"/> </instance_attributes> - <meta_attributes id="primitive-export_home_ocfs2.meta"/> </primitive> <meta_attributes id="meta_attributes.id22093"> <nvpair id="nvpair.id22100" name="globally-unique" value="true"/> @@ -78,7 +77,6 @@ <operations> <op name="monitor" interval="15" id="op.auto-2" timeout="15" start-delay="15" on-fail="stop" enabled="true" role="Started"/> </operations> - <meta_attributes id="primitive-resource_nfsserver_single.meta"/> </primitive> <meta_attributes id="meta_attributes.id22250"/> <meta_attributes id="group-group_nfs.meta"/> diff --git a/cts/pengine/bug-pm-11.xml b/cts/pengine/bug-pm-11.xml index 332050855..9f1a41c51 100644 --- a/cts/pengine/bug-pm-11.xml +++ b/cts/pengine/bug-pm-11.xml @@ -20,12 +20,8 @@ <resources> <clone id="ms-sf"> <group id="group"> - <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat"> - <meta_attributes id="primitive-stateful-1.meta"/> - </primitive> - <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat"> - <meta_attributes id="primitive-stateful-2.meta"/> - </primitive> + <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat"/> + <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat"/> <meta_attributes id="group-group.meta"/> </group> <meta_attributes id="clone-ms-sf.meta"> diff --git a/cts/pengine/bug-pm-12.xml b/cts/pengine/bug-pm-12.xml index b77a15c28..41631aebf 100644 --- a/cts/pengine/bug-pm-12.xml +++ b/cts/pengine/bug-pm-12.xml @@ -20,15 +20,12 @@ <resources> <clone id="ms-sf"> <group id="group"> - <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat"> - <meta_attributes id="primitive-stateful-1.meta"/> - </primitive> + <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat"/> <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat"> <instance_attributes id="instance_attributes.id21990"> <nvpair id="nvpair.id21997" name="test1" value="1"/> <nvpair id="nvpair.id22005" name="test2" value="2"/> </instance_attributes> - <meta_attributes id="primitive-stateful-2.meta"/> </primitive> <meta_attributes id="group-group.meta"/> </group> diff --git a/cts/pengine/bug-rh-1097457.xml b/cts/pengine/bug-rh-1097457.xml index 58debf866..8a2185fc1 100644 --- a/cts/pengine/bug-rh-1097457.xml +++ b/cts/pengine/bug-rh-1097457.xml @@ -79,7 +79,6 @@ <op id="FSlun1-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="FSlun1-monitor-interval-10" interval="10" name="monitor" on-fail="restart"/> </operations> - <meta_attributes id="FSlun1-meta_attributes"/> </primitive> <primitive class="ocf" id="FSlun2" provider="heartbeat" type="Filesystem"> <instance_attributes id="FSlun2-instance_attributes"> @@ -92,7 +91,6 @@ <op id="FSlun2-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="FSlun2-monitor-interval-10" interval="10" name="monitor" on-fail="restart"/> </operations> - <meta_attributes id="FSlun2-meta_attributes"/> </primitive> <primitive class="ocf" id="VM2" provider="heartbeat" type="VirtualDomain"> <instance_attributes id="VM2-instance_attributes"> diff --git a/cts/pengine/clone-anon-probe-1.xml b/cts/pengine/clone-anon-probe-1.xml index 71f55f26b..0e971c1ee 100644 --- a/cts/pengine/clone-anon-probe-1.xml +++ b/cts/pengine/clone-anon-probe-1.xml @@ -39,7 +39,6 @@ <instance_attributes id="instance_attributes.id22007"> <nvpair id="nvpair.id22013" name="drbd_resource" value="r0"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> diff --git a/cts/pengine/clone-anon-probe-2.xml b/cts/pengine/clone-anon-probe-2.xml index ce8159db8..08eac4024 100644 --- a/cts/pengine/clone-anon-probe-2.xml +++ b/cts/pengine/clone-anon-probe-2.xml @@ -39,7 +39,6 @@ <instance_attributes id="instance_attributes.id22007"> <nvpair id="nvpair.id22013" name="drbd_resource" value="r0"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> diff --git a/cts/pengine/clone-no-shuffle.xml b/cts/pengine/clone-no-shuffle.xml index c071921a4..141f18ebe 100644 --- a/cts/pengine/clone-no-shuffle.xml +++ b/cts/pengine/clone-no-shuffle.xml @@ -49,7 +49,6 @@ <op name="monitor" interval="10s" id="op-ms-drbd1-1" timeout="15s" start-delay="30s" role="Master"/> <op name="monitor" interval="11s" id="op-ms-drbd1-2" timeout="15s" start-delay="30s" role="Slave"/> </operations> - <meta_attributes id="primitive-drbd1.meta"/> </primitive> <meta_attributes id="clone-ms-drbd1.meta"/> </clone> @@ -63,7 +62,6 @@ <operations> <op name="monitor" interval="21s" id="op-proftpd-1" timeout="5s" start-delay="21s"/> </operations> - <meta_attributes id="primitive-testip.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/cloned-group-stop.xml b/cts/pengine/cloned-group-stop.xml index 970a0a667..bcf81e7b8 100644 --- a/cts/pengine/cloned-group-stop.xml +++ b/cts/pengine/cloned-group-stop.xml @@ -45,7 +45,6 @@ <operations> <op id="mysql-db-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="mysql-db-meta_attributes"/> </primitive> <meta_attributes id="mysql-group-meta_attributes"/> </group> @@ -54,7 +53,6 @@ <operations> <op id="qpidd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="qpidd-meta_attributes"/> </primitive> <meta_attributes id="beekhof-meta_attributes"> <nvpair id="beekhof" name="target-role" value="Stopped"/> diff --git a/cts/pengine/cloned-group.xml b/cts/pengine/cloned-group.xml index add6bc86b..b7684a4f9 100644 --- a/cts/pengine/cloned-group.xml +++ b/cts/pengine/cloned-group.xml @@ -38,7 +38,6 @@ <operations> <op name="monitor" interval="10s" id="mysql-proxy_mon" timeout="20s"/> </operations> - <meta_attributes id="primitive-mysql-proxy.meta"/> </primitive> <meta_attributes id="group-grrr.meta"/> </group> diff --git a/cts/pengine/coloc-attr.xml b/cts/pengine/coloc-attr.xml index 34c219c4a..1c2f2cccb 100644 --- a/cts/pengine/coloc-attr.xml +++ b/cts/pengine/coloc-attr.xml @@ -46,9 +46,7 @@ <nvpair id="nvpair.id22578" name="ordered" value="true"/> <nvpair id="nvpair.id22587" name="collocated" value="true"/> </meta_attributes> - <primitive id="resource_t11" class="lsb" type="nfsserver"> - <meta_attributes id="primitive-resource_t11.meta"/> - </primitive> + <primitive id="resource_t11" class="lsb" type="nfsserver"/> </group> <group id="group_test2"> <meta_attributes id="group-group_test2.meta"/> @@ -56,9 +54,7 @@ <nvpair id="nvpair.id22620" name="ordered" value="true"/> <nvpair id="nvpair.id22629" name="collocated" value="true"/> </meta_attributes> - <primitive id="resource_t21" class="ocf" type="Dummy" provider="heartbeat"> - <meta_attributes id="primitive-resource_t21.meta"/> - </primitive> + <primitive id="resource_t21" class="ocf" type="Dummy" provider="heartbeat"/> </group> </resources> <constraints> diff --git a/cts/pengine/coloc-group.xml b/cts/pengine/coloc-group.xml index f91287e8a..51f784b72 100644 --- a/cts/pengine/coloc-group.xml +++ b/cts/pengine/coloc-group.xml @@ -20,19 +20,11 @@ <node id="node3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="group1"> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-group1.meta"/> </group> </resources> diff --git a/cts/pengine/coloc-list.xml b/cts/pengine/coloc-list.xml index b84142ce9..9f65cb1fd 100644 --- a/cts/pengine/coloc-list.xml +++ b/cts/pengine/coloc-list.xml @@ -20,21 +20,11 @@ <node id="node3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> - <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_colocation id="colo-2-1" rsc="rsc2" with-rsc="rsc1" score="INFINITY"/> diff --git a/cts/pengine/coloc-loop.xml b/cts/pengine/coloc-loop.xml index fdde75647..a16f0dd1f 100644 --- a/cts/pengine/coloc-loop.xml +++ b/cts/pengine/coloc-loop.xml @@ -20,15 +20,9 @@ <node id="node3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_colocation id="colo-1-2" rsc="rsc1" with-rsc="rsc2" score="INFINITY"/> diff --git a/cts/pengine/coloc-many-one.xml b/cts/pengine/coloc-many-one.xml index a0e34d016..bbc217570 100644 --- a/cts/pengine/coloc-many-one.xml +++ b/cts/pengine/coloc-many-one.xml @@ -20,18 +20,10 @@ <node id="node3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_colocation id="colo-2-1" rsc="rsc2" with-rsc="rsc1" score="INFINITY"/> diff --git a/cts/pengine/coloc-slave-anti.xml b/cts/pengine/coloc-slave-anti.xml index e55334d4d..cb671ec28 100644 --- a/cts/pengine/coloc-slave-anti.xml +++ b/cts/pengine/coloc-slave-anti.xml @@ -77,7 +77,6 @@ <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> - <meta_attributes id="primitive-drbd-r0.meta"/> </primitive> <meta_attributes id="clone-drbd-msr.meta"> <nvpair id="ordered.meta.auto-96" name="ordered" value="false"/> @@ -96,7 +95,6 @@ <op name="start" interval="0" id="fs-1-start" timeout="10s"/> <op name="stop" interval="0" id="fs-1-stop" timeout="10s"/> </operations> - <meta_attributes id="primitive-fs-1.meta"/> </primitive> <primitive id="ip-198" class="ocf" provider="heartbeat" type="IPaddr2"> <instance_attributes id="instance_attributes.id22418"> @@ -110,7 +108,6 @@ <op name="start" interval="0" id="ip-198-start" timeout="10s"/> <op name="stop" interval="0" id="ip-198-stop" timeout="10s"/> </operations> - <meta_attributes id="primitive-ip-198.meta"/> </primitive> <primitive id="apache" class="ocf" provider="custom" type="apache2"> <instance_attributes id="instance_attributes.id22503"> @@ -125,7 +122,6 @@ <op name="start" interval="0" id="apache-start" timeout="30s"/> <op name="stop" interval="0" id="apache-stop" timeout="30s"/> </operations> - <meta_attributes id="primitive-apache.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> diff --git a/cts/pengine/concurrent-fencing.xml b/cts/pengine/concurrent-fencing.xml index f110af89e..25c7e240b 100644 --- a/cts/pengine/concurrent-fencing.xml +++ b/cts/pengine/concurrent-fencing.xml @@ -14,9 +14,7 @@ </nodes> <resources> <primitive id="stonith-1" class="stonith" type="dummy"/> - <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"> - <meta_attributes id="primitive-lsb_dummy.meta"/> - </primitive> + <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/container-is-remote-node.xml b/cts/pengine/container-is-remote-node.xml index b487c5b2e..41be0afd9 100644 --- a/cts/pengine/container-is-remote-node.xml +++ b/cts/pengine/container-is-remote-node.xml @@ -143,7 +143,6 @@ <op id="FSdata1-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="FSdata1-monitor-interval-10" interval="10" name="monitor" on-fail="fence"/> </operations> - <meta_attributes id="FSdata1-meta_attributes"/> </primitive> <meta_attributes id="RES1-meta_attributes"> <nvpair id="RES1-meta_attributes-target-role" name="target-role" value="Started"/> diff --git a/cts/pengine/date-1.xml b/cts/pengine/date-1.xml index 3fd955983..93c56770f 100644 --- a/cts/pengine/date-1.xml +++ b/cts/pengine/date-1.xml @@ -44,7 +44,6 @@ <expression id="expression.id22001" attribute="#uname" operation="eq" value="node2"/> </rule> </instance_attributes> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/date-2.xml b/cts/pengine/date-2.xml index fd287ce53..faad31720 100644 --- a/cts/pengine/date-2.xml +++ b/cts/pengine/date-2.xml @@ -25,14 +25,12 @@ <instance_attributes id="instance_attributes.id21962"> <nvpair id="nvpair.id21968" name="1" value="10.1.1.1/24/sit0"/> </instance_attributes> - <meta_attributes id="primitive-test_ip.meta"/> </primitive> <primitive id="test_mailto" class="ocf" type="MailTo" provider="heartbeat"> <instance_attributes id="instance_attributes.id21991"> <nvpair id="nvpair.id21998" name="email" value="root"/> <nvpair id="nvpair.id22006" name="subject" value="Test IP Failover"/> </instance_attributes> - <meta_attributes id="primitive-test_mailto.meta"/> </primitive> <meta_attributes id="group-test.meta"/> </group> diff --git a/cts/pengine/date-3.xml b/cts/pengine/date-3.xml index fd287ce53..faad31720 100644 --- a/cts/pengine/date-3.xml +++ b/cts/pengine/date-3.xml @@ -25,14 +25,12 @@ <instance_attributes id="instance_attributes.id21962"> <nvpair id="nvpair.id21968" name="1" value="10.1.1.1/24/sit0"/> </instance_attributes> - <meta_attributes id="primitive-test_ip.meta"/> </primitive> <primitive id="test_mailto" class="ocf" type="MailTo" provider="heartbeat"> <instance_attributes id="instance_attributes.id21991"> <nvpair id="nvpair.id21998" name="email" value="root"/> <nvpair id="nvpair.id22006" name="subject" value="Test IP Failover"/> </instance_attributes> - <meta_attributes id="primitive-test_mailto.meta"/> </primitive> <meta_attributes id="group-test.meta"/> </group> diff --git a/cts/pengine/enforce-colo1.xml b/cts/pengine/enforce-colo1.xml index 8b59910d9..c61a7f0f3 100644 --- a/cts/pengine/enforce-colo1.xml +++ b/cts/pengine/enforce-colo1.xml @@ -52,7 +52,6 @@ <op id="central-stop-timeout-20" interval="0s" name="stop" timeout="20"/> <op id="central-monitor-interval-10" interval="10" name="monitor" timeout="20"/> </operations> - <meta_attributes id="central-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/group-dependents.xml b/cts/pengine/group-dependents.xml index 34f2573eb..60752d644 100644 --- a/cts/pengine/group-dependents.xml +++ b/cts/pengine/group-dependents.xml @@ -207,8 +207,6 @@ <op id="iax2_mon-stop-0" interval="0" name="stop" timeout="20s"/> <op id="iax2_mon-monitor-60s" interval="60s" name="monitor" start-delay="30" timeout="20s"/> </operations> - <meta_attributes id="iax2_mon-meta_attributes"> - </meta_attributes> </primitive> <primitive class="lsb" id="httpd" type="apache2"> <operations> diff --git a/cts/pengine/group1.xml b/cts/pengine/group1.xml index 582cbfb52..aefe95264 100644 --- a/cts/pengine/group1.xml +++ b/cts/pengine/group1.xml @@ -15,15 +15,9 @@ </nodes> <resources> <group id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc1.meta"/> </group> </resources> diff --git a/cts/pengine/group10.xml b/cts/pengine/group10.xml index 543119ac0..955f05537 100644 --- a/cts/pengine/group10.xml +++ b/cts/pengine/group10.xml @@ -36,7 +36,6 @@ <instance_attributes id="instance_attributes.id22013"> <nvpair id="nvpair.id22019" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.181.meta"/> </primitive> <primitive id="child_192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -45,7 +44,6 @@ <instance_attributes id="instance_attributes.id22055"> <nvpair id="nvpair.id22061" name="ip" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.182.meta"/> </primitive> <primitive id="child_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -54,7 +52,6 @@ <instance_attributes id="instance_attributes.id22097"> <nvpair id="nvpair.id22103" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> diff --git a/cts/pengine/group11.xml b/cts/pengine/group11.xml index adb5f1028..47eb034a3 100644 --- a/cts/pengine/group11.xml +++ b/cts/pengine/group11.xml @@ -32,9 +32,7 @@ <nvpair id="nvpair.meta.auto-46" name="target-role" value="Stopped"/> </meta_attributes> </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-group1.meta"> <nvpair id="nvpair.meta.auto-25" name="target-role" value="started"/> </meta_attributes> diff --git a/cts/pengine/group13.xml b/cts/pengine/group13.xml index 93e1a8477..8d0ad9f7d 100644 --- a/cts/pengine/group13.xml +++ b/cts/pengine/group13.xml @@ -10,9 +10,7 @@ </nodes> <resources> <group id="nfs"> - <primitive id="resource_nfs" class="lsb" type="nfs"> - <meta_attributes id="primitive-resource_nfs.meta"/> - </primitive> + <primitive id="resource_nfs" class="lsb" type="nfs"/> <meta_attributes id="group-nfs.meta"/> </group> <group id="fs"> diff --git a/cts/pengine/group14.xml b/cts/pengine/group14.xml index f685081c8..0303bdc7b 100644 --- a/cts/pengine/group14.xml +++ b/cts/pengine/group14.xml @@ -46,7 +46,6 @@ <instance_attributes id="instance_attributes.id22126"> <nvpair id="nvpair.id22133" name="1" value="192.168.100.180"/> </instance_attributes> - <meta_attributes id="primitive-DcIPaddr.meta"/> </primitive> <group id="group-1"> <primitive id="r192.168.100.181" class="ocf" type="IPaddr" provider="heartbeat"> @@ -56,7 +55,6 @@ <instance_attributes id="instance_attributes.id22171"> <nvpair id="nvpair.id22178" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.181.meta"/> </primitive> <primitive id="r192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -65,7 +63,6 @@ <instance_attributes id="instance_attributes.id22212"> <nvpair id="nvpair.id22219" name="ip" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.182.meta"/> </primitive> <primitive id="r192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -74,7 +71,6 @@ <instance_attributes id="instance_attributes.id22253"> <nvpair id="nvpair.id22260" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -82,7 +78,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="migrator" class="ocf" type="Dummy" provider="heartbeat"> <operations> @@ -102,7 +97,6 @@ <instance_attributes id="instance_attributes.id22358"> <nvpair id="nvpair.id22364" name="ip" value="192.168.100.184"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n03.meta"/> </primitive> <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -111,7 +105,6 @@ <instance_attributes id="instance_attributes.id22397"> <nvpair id="nvpair.id22404" name="ip" value="192.168.100.185"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n02.meta"/> </primitive> <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -120,7 +113,6 @@ <instance_attributes id="instance_attributes.id22437"> <nvpair id="nvpair.id22444" name="ip" value="192.168.100.186"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n04.meta"/> </primitive> <primitive id="rsc_c001n05" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -129,7 +121,6 @@ <instance_attributes id="instance_attributes.id22477"> <nvpair id="nvpair.id22483" name="ip" value="192.168.100.187"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n05.meta"/> </primitive> <primitive id="rsc_c001n06" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -138,7 +129,6 @@ <instance_attributes id="instance_attributes.id22517"> <nvpair id="nvpair.id22523" name="ip" value="192.168.100.188"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n06.meta"/> </primitive> <primitive id="rsc_c001n07" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -147,7 +137,6 @@ <instance_attributes id="instance_attributes.id22556"> <nvpair id="nvpair.id22563" name="ip" value="192.168.100.189"/> </instance_attributes> - <meta_attributes id="primitive-rsc_c001n07.meta"/> </primitive> <clone id="DoFencing"> <primitive id="child_DoFencing" class="stonith" type="ssh"> @@ -175,7 +164,6 @@ <op name="monitor" interval="5s" id="ocf_msdummy_monitor"/> <op name="monitor" interval="6s" id="ocf_msdummy_monitor_master" role="Master"/> </operations> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-306" name="promotable" value="true"/> diff --git a/cts/pengine/group15.xml b/cts/pengine/group15.xml index 7e3fb39dd..42cd0d9fc 100644 --- a/cts/pengine/group15.xml +++ b/cts/pengine/group15.xml @@ -20,27 +20,15 @@ </rsc_defaults> <resources> <group id="foo"> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> - <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-foo.meta"/> </group> <group id="bar"> - <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc6.meta"/> - </primitive> - <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc7.meta"/> - </primitive> - <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc8.meta"/> - </primitive> + <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-bar.meta"> <nvpair id="resource_stickiness.meta.auto-34" name="resource-stickiness" value="0"/> </meta_attributes> diff --git a/cts/pengine/group2.xml b/cts/pengine/group2.xml index 7a12d939a..fda34978a 100644 --- a/cts/pengine/group2.xml +++ b/cts/pengine/group2.xml @@ -13,24 +13,14 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="rsc2"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/group3.xml b/cts/pengine/group3.xml index 03d0d0ec6..3ff69cc5d 100644 --- a/cts/pengine/group3.xml +++ b/cts/pengine/group3.xml @@ -14,27 +14,15 @@ </nodes> <resources> <group id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc1.meta"/> </group> <group id="rsc2"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> </resources> diff --git a/cts/pengine/group4.xml b/cts/pengine/group4.xml index 2ee9f1644..b0d8868be 100644 --- a/cts/pengine/group4.xml +++ b/cts/pengine/group4.xml @@ -14,24 +14,14 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="rsc2"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/group5.xml b/cts/pengine/group5.xml index 58c304982..09fe3fe81 100644 --- a/cts/pengine/group5.xml +++ b/cts/pengine/group5.xml @@ -11,24 +11,14 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="rsc2"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/group6.xml b/cts/pengine/group6.xml index 1ae62563b..96bf7be09 100644 --- a/cts/pengine/group6.xml +++ b/cts/pengine/group6.xml @@ -14,27 +14,15 @@ </nodes> <resources> <group id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc1.meta"/> </group> <group id="rsc2"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> </resources> diff --git a/cts/pengine/group7.xml b/cts/pengine/group7.xml index a8f6441e9..24592d4aa 100644 --- a/cts/pengine/group7.xml +++ b/cts/pengine/group7.xml @@ -14,31 +14,17 @@ <node id="uuid3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="rsc2"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> <group id="rsc3"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc3.meta"/> </group> </resources> diff --git a/cts/pengine/group8.xml b/cts/pengine/group8.xml index b84c814df..c4e1c4397 100644 --- a/cts/pengine/group8.xml +++ b/cts/pengine/group8.xml @@ -12,31 +12,17 @@ <node id="uuid3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <group id="rsc2"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc2.meta"/> </group> <group id="rsc3"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-rsc3.meta"/> </group> </resources> diff --git a/cts/pengine/group9.xml b/cts/pengine/group9.xml index 585865c31..6fe243491 100644 --- a/cts/pengine/group9.xml +++ b/cts/pengine/group9.xml @@ -19,34 +19,18 @@ </meta_attributes> </rsc_defaults> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> <group id="foo"> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> - <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-foo.meta"/> </group> <group id="bar"> - <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc6.meta"/> - </primitive> - <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc7.meta"/> - </primitive> - <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc8.meta"/> - </primitive> + <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-bar.meta"> <nvpair id="resource_stickiness.meta.auto-38" name="resource-stickiness" value="0"/> </meta_attributes> diff --git a/cts/pengine/inc0.xml b/cts/pengine/inc0.xml index e8121259b..05349eba9 100644 --- a/cts/pengine/inc0.xml +++ b/cts/pengine/inc0.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-27" name="clone-max" value="5"/> diff --git a/cts/pengine/inc1.xml b/cts/pengine/inc1.xml index b92e5f1fe..0e68140d4 100644 --- a/cts/pengine/inc1.xml +++ b/cts/pengine/inc1.xml @@ -13,13 +13,9 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="nvpair.meta.auto-33" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-29" name="clone-max" value="5"/> @@ -27,9 +23,7 @@ <nvpair id="unique-1" name="globally-unique" value="true"/> </meta_attributes> </clone> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" score="0"/> diff --git a/cts/pengine/inc10.xml b/cts/pengine/inc10.xml index 607b8806d..4558cd5bb 100644 --- a/cts/pengine/inc10.xml +++ b/cts/pengine/inc10.xml @@ -61,7 +61,6 @@ <nvpair id="nvpair.id22197" name="directory" value="/mnt/share1"/> <nvpair id="nvpair.id22205" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-ocfs2.meta"/> </primitive> <meta_attributes id="clone-ocfs2-clone.meta"> <nvpair id="notify.meta.auto-96" name="notify" value="true"/> diff --git a/cts/pengine/inc11.xml b/cts/pengine/inc11.xml index 731a331ce..846aebf3a 100644 --- a/cts/pengine/inc11.xml +++ b/cts/pengine/inc11.xml @@ -24,13 +24,9 @@ </node> </nodes> <resources> - <primitive id="simple-rsc" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-simple-rsc.meta"/> - </primitive> + <primitive id="simple-rsc" class="ocf" provider="heartbeat" type="apache"/> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-60" name="promotable" value="true"/> <nvpair id="nvpair.meta.auto-61" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/inc12.xml b/cts/pengine/inc12.xml index fbd462649..ae7b55b21 100644 --- a/cts/pengine/inc12.xml +++ b/cts/pengine/inc12.xml @@ -51,7 +51,6 @@ <instance_attributes id="instance_attributes.id22144"> <nvpair id="nvpair.id22150" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -60,7 +59,6 @@ <instance_attributes id="instance_attributes.id22185"> <nvpair id="nvpair.id22191" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -69,7 +67,6 @@ <instance_attributes id="instance_attributes.id22225"> <nvpair id="nvpair.id22232" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -77,7 +74,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -177,7 +173,6 @@ <op name="monitor" interval="5s" id="ocf_msdummy_monitor"/> <op name="monitor" interval="6s" id="ocf_msdummy_monitor_master" role="Master"/> </operations> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-294" name="promotable" value="true"/> diff --git a/cts/pengine/inc2.xml b/cts/pengine/inc2.xml index f035f8f02..17998f828 100644 --- a/cts/pengine/inc2.xml +++ b/cts/pengine/inc2.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-27" name="clone-max" value="5"/> diff --git a/cts/pengine/inc3.xml b/cts/pengine/inc3.xml index 00cec650b..6bc829572 100644 --- a/cts/pengine/inc3.xml +++ b/cts/pengine/inc3.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-27" name="clone-max" value="5"/> <nvpair id="nvpair.meta.auto-29" name="clone-node-max" value="2"/> @@ -24,9 +22,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="nvpair.meta.auto-46" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-42" name="clone-max" value="5"/> diff --git a/cts/pengine/inc4.xml b/cts/pengine/inc4.xml index 664c3a75d..06d3c5f3c 100644 --- a/cts/pengine/inc4.xml +++ b/cts/pengine/inc4.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="ordered.meta.auto-21" name="ordered" value="true"/> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> @@ -26,9 +24,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="ordered.meta.auto-38" name="ordered" value="true"/> <nvpair id="nvpair.meta.auto-48" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/inc5.xml b/cts/pengine/inc5.xml index b7a70a16e..df5b5ff36 100644 --- a/cts/pengine/inc5.xml +++ b/cts/pengine/inc5.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-27" name="clone-max" value="3"/> @@ -25,9 +23,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="nvpair.meta.auto-48" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-44" name="clone-max" value="3"/> @@ -36,9 +32,7 @@ </meta_attributes> </clone> <clone id="rsc3"> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc3.meta"> <nvpair id="nvpair.meta.auto-65" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-61" name="clone-max" value="3"/> @@ -47,9 +41,7 @@ </meta_attributes> </clone> <clone id="rsc4"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc4.meta"> <nvpair id="nvpair.meta.auto-82" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-78" name="clone-max" value="3"/> @@ -58,9 +50,7 @@ </meta_attributes> </clone> <clone id="rsc5"> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc5.meta"> <nvpair id="nvpair.meta.auto-99" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-95" name="clone-max" value="3"/> @@ -69,9 +59,7 @@ </meta_attributes> </clone> <clone id="rsc6"> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc6.meta"> <nvpair id="nvpair.meta.auto-116" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-112" name="clone-max" value="3"/> @@ -80,9 +68,7 @@ </meta_attributes> </clone> <clone id="rsc7"> - <primitive id="child_rsc7" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc7.meta"/> - </primitive> + <primitive id="child_rsc7" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc7.meta"> <nvpair id="nvpair.meta.auto-133" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-129" name="clone-max" value="3"/> @@ -91,9 +77,7 @@ </meta_attributes> </clone> <clone id="rsc8"> - <primitive id="child_rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc8.meta"/> - </primitive> + <primitive id="child_rsc8" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc8.meta"> <nvpair id="nvpair.meta.auto-150" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-146" name="clone-max" value="3"/> diff --git a/cts/pengine/inc6.xml b/cts/pengine/inc6.xml index 2062c7c3a..2ff44eb9d 100644 --- a/cts/pengine/inc6.xml +++ b/cts/pengine/inc6.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-27" name="clone-max" value="3"/> @@ -24,9 +22,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="restart_type.meta.auto-38" name="restart-type" value="restart"/> <nvpair id="nvpair.meta.auto-48" name="resource-stickiness" value="1"/> @@ -36,9 +32,7 @@ </meta_attributes> </clone> <clone id="rsc3"> - <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc3.meta"/> - </primitive> + <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc3.meta"> <nvpair id="restart_type.meta.auto-55" name="restart-type" value="restart"/> <nvpair id="nvpair.meta.auto-65" name="resource-stickiness" value="1"/> @@ -47,9 +41,7 @@ </meta_attributes> </clone> <clone id="rsc4"> - <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc4.meta"/> - </primitive> + <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc4.meta"> <nvpair id="nvpair.meta.auto-82" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-78" name="clone-max" value="3"/> @@ -58,9 +50,7 @@ </meta_attributes> </clone> <clone id="rsc5"> - <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc5.meta"/> - </primitive> + <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc5.meta"> <nvpair id="nvpair.meta.auto-99" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-95" name="clone-max" value="3"/> @@ -69,9 +59,7 @@ </meta_attributes> </clone> <clone id="rsc6"> - <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc6.meta"/> - </primitive> + <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc6.meta"> <nvpair id="restart_type.meta.auto-106" name="restart-type" value="restart"/> <nvpair id="nvpair.meta.auto-116" name="resource-stickiness" value="1"/> @@ -80,9 +68,7 @@ </meta_attributes> </clone> <clone id="rsc7"> - <primitive id="child_rsc7" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc7.meta"/> - </primitive> + <primitive id="child_rsc7" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc7.meta"> <nvpair id="restart_type.meta.auto-123" name="restart-type" value="restart"/> <nvpair id="nvpair.meta.auto-133" name="resource-stickiness" value="1"/> @@ -92,9 +78,7 @@ </meta_attributes> </clone> <clone id="rsc8"> - <primitive id="child_rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc8.meta"/> - </primitive> + <primitive id="child_rsc8" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc8.meta"> <nvpair id="nvpair.meta.auto-150" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-146" name="clone-max" value="3"/> diff --git a/cts/pengine/inc7.xml b/cts/pengine/inc7.xml index 4a74c8645..3b5ba4664 100644 --- a/cts/pengine/inc7.xml +++ b/cts/pengine/inc7.xml @@ -14,13 +14,9 @@ <node id="uuid3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc0" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc0.meta"/> - </primitive> + <primitive id="rsc0" class="ocf" provider="heartbeat" type="apache"/> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="interleave.meta.auto-25" name="interleave" value="1"/> <nvpair id="nvpair.meta.auto-35" name="resource-stickiness" value="1"/> @@ -30,9 +26,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="interleave.meta.auto-42" name="interleave" value="1"/> <nvpair id="nvpair.meta.auto-52" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/inc8.xml b/cts/pengine/inc8.xml index b02e05b36..497fc8cfe 100644 --- a/cts/pengine/inc8.xml +++ b/cts/pengine/inc8.xml @@ -13,13 +13,9 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc0" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc0.meta"/> - </primitive> + <primitive id="rsc0" class="ocf" provider="heartbeat" type="apache"/> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-33" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-29" name="clone-max" value="5"/> @@ -28,9 +24,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="nvpair.meta.auto-50" name="resource-stickiness" value="1"/> <nvpair id="nvpair.meta.auto-46" name="clone-max" value="5"/> diff --git a/cts/pengine/inc9.xml b/cts/pengine/inc9.xml index b1a412246..e490c0fd2 100644 --- a/cts/pengine/inc9.xml +++ b/cts/pengine/inc9.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="globally_unique.meta.auto-21" name="globally-unique" value="false"/> <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/interleave-0.xml b/cts/pengine/interleave-0.xml index 4110da50b..261c05833 100644 --- a/cts/pengine/interleave-0.xml +++ b/cts/pengine/interleave-0.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22420"> <nvpair id="nvpair.id22426" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="resource_stickiness.meta.auto-194" name="resource-stickiness" value="200"/> @@ -148,7 +147,6 @@ <instance_attributes id="instance_attributes.id22490"> <nvpair id="nvpair.id22496" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_CloneSet.meta"/> </primitive> <meta_attributes id="clone-CloneSet.meta"> <nvpair id="nvpair.meta.auto-229" name="clone-max" value="8"/> diff --git a/cts/pengine/interleave-1.xml b/cts/pengine/interleave-1.xml index f97f9a9e8..9a08b5003 100644 --- a/cts/pengine/interleave-1.xml +++ b/cts/pengine/interleave-1.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22420"> <nvpair id="nvpair.id22426" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="resource_stickiness.meta.auto-194" name="resource-stickiness" value="200"/> @@ -148,7 +147,6 @@ <instance_attributes id="instance_attributes.id22490"> <nvpair id="nvpair.id22496" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_CloneSet.meta"/> </primitive> <meta_attributes id="clone-CloneSet.meta"> <nvpair id="nvpair.meta.auto-229" name="clone-max" value="8"/> diff --git a/cts/pengine/interleave-2.xml b/cts/pengine/interleave-2.xml index a91fb3fed..fe3dac706 100644 --- a/cts/pengine/interleave-2.xml +++ b/cts/pengine/interleave-2.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22422"> <nvpair id="nvpair.id22428" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="interleave.meta.auto-194" name="interleave" value="1"/> @@ -149,7 +148,6 @@ <instance_attributes id="instance_attributes.id22494"> <nvpair id="nvpair.id22500" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_CloneSet.meta"/> </primitive> <meta_attributes id="clone-CloneSet.meta"> <nvpair id="interleave.meta.auto-223" name="interleave" value="1"/> diff --git a/cts/pengine/interleave-3.xml b/cts/pengine/interleave-3.xml index 5d0c6892d..745cb10ab 100644 --- a/cts/pengine/interleave-3.xml +++ b/cts/pengine/interleave-3.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22422"> <nvpair id="nvpair.id22428" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="interleave.meta.auto-194" name="interleave" value="1"/> @@ -149,7 +148,6 @@ <instance_attributes id="instance_attributes.id22494"> <nvpair id="nvpair.id22500" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_CloneSet.meta"/> </primitive> <meta_attributes id="clone-CloneSet.meta"> <nvpair id="interleave.meta.auto-223" name="interleave" value="1"/> diff --git a/cts/pengine/interleave-pseudo-stop.xml b/cts/pengine/interleave-pseudo-stop.xml index a41cfc4af..c9e70b067 100644 --- a/cts/pengine/interleave-pseudo-stop.xml +++ b/cts/pengine/interleave-pseudo-stop.xml @@ -26,7 +26,6 @@ <operations> <op name="monitor" interval="5" id="op.auto-1"/> </operations> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"/> </clone> @@ -38,9 +37,7 @@ <nvpair id="nvpair.id22035" name="globally-unique" value="false"/> <nvpair id="nvpair.id22044" name="notify" value="true"/> </meta_attributes> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"/> </clone> <clone id="imagestorecloneset"> @@ -66,7 +63,6 @@ <meta_attributes id="meta_attributes.id22213"> <nvpair id="nvpair.id22220" name="target-role" value="started"/> </meta_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"/> </clone> @@ -90,7 +86,6 @@ <op name="stop" interval="0" id="c32d29d2-25a9-4c42-ba55-1d5e087162b1" timeout="60"/> <op name="start" interval="0" id="a2147200-7172-4d96-85ea-0ebec68f5fb7" timeout="60"/> </operations> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"/> </clone> diff --git a/cts/pengine/interleave-restart.xml b/cts/pengine/interleave-restart.xml index 3c07a572a..5eec2defc 100644 --- a/cts/pengine/interleave-restart.xml +++ b/cts/pengine/interleave-restart.xml @@ -30,7 +30,6 @@ <operations> <op name="monitor" interval="5" id="op.auto-1"/> </operations> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"/> </clone> @@ -42,9 +41,7 @@ <nvpair id="nvpair.id22054" name="globally-unique" value="false"/> <nvpair id="nvpair.id22063" name="notify" value="true"/> </meta_attributes> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"/> </clone> <clone id="imagestorecloneset"> @@ -70,7 +67,6 @@ <meta_attributes id="meta_attributes.id22232"> <nvpair id="nvpair.id22238" name="target-role" value="started"/> </meta_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"/> </clone> @@ -94,7 +90,6 @@ <op name="stop" interval="0" id="c32d29d2-25a9-4c42-ba55-1d5e087162b1" timeout="60"/> <op name="start" interval="0" id="a2147200-7172-4d96-85ea-0ebec68f5fb7" timeout="60"/> </operations> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"/> </clone> diff --git a/cts/pengine/interleave-stop.xml b/cts/pengine/interleave-stop.xml index 6182f1df5..81d03855a 100644 --- a/cts/pengine/interleave-stop.xml +++ b/cts/pengine/interleave-stop.xml @@ -30,7 +30,6 @@ <operations> <op name="monitor" interval="5" id="op.auto-1"/> </operations> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"/> </clone> @@ -42,9 +41,7 @@ <nvpair id="nvpair.id22054" name="globally-unique" value="false"/> <nvpair id="nvpair.id22063" name="notify" value="true"/> </meta_attributes> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"/> </clone> <clone id="imagestorecloneset"> @@ -70,7 +67,6 @@ <meta_attributes id="meta_attributes.id22232"> <nvpair id="nvpair.id22239" name="target-role" value="started"/> </meta_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"/> </clone> @@ -94,7 +90,6 @@ <op name="stop" interval="0" id="c32d29d2-25a9-4c42-ba55-1d5e087162b1" timeout="60"/> <op name="start" interval="0" id="a2147200-7172-4d96-85ea-0ebec68f5fb7" timeout="60"/> </operations> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"/> </clone> diff --git a/cts/pengine/managed-0.xml b/cts/pengine/managed-0.xml index 211a5f1e9..7611fad7c 100644 --- a/cts/pengine/managed-0.xml +++ b/cts/pengine/managed-0.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22417"> <nvpair id="nvpair.id22423" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="nvpair.meta.auto-200" name="clone-max" value="8"/> diff --git a/cts/pengine/managed-1.xml b/cts/pengine/managed-1.xml index e5e808918..2f93aeaeb 100644 --- a/cts/pengine/managed-1.xml +++ b/cts/pengine/managed-1.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22418"> <nvpair id="nvpair.id22425" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="is_managed.meta.auto-194" name="is-managed" value="0"/> diff --git a/cts/pengine/managed-2.xml b/cts/pengine/managed-2.xml index c76116382..27f4d5c0b 100644 --- a/cts/pengine/managed-2.xml +++ b/cts/pengine/managed-2.xml @@ -131,7 +131,6 @@ <instance_attributes id="instance_attributes.id22418"> <nvpair id="nvpair.id22425" name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/> </instance_attributes> - <meta_attributes id="primitive-child_DoFencing.meta"/> </primitive> <meta_attributes id="clone-DoFencing.meta"> <nvpair id="is_managed.meta.auto-194" name="is-managed" value="0"/> diff --git a/cts/pengine/master-0.xml b/cts/pengine/master-0.xml index b7a0f521e..a70821dd8 100644 --- a/cts/pengine/master-0.xml +++ b/cts/pengine/master-0.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-34" name="promotable" value="true"/> <nvpair id="nvpair.meta.auto-35" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/master-1.xml b/cts/pengine/master-1.xml index b9f8522ac..a220ee976 100644 --- a/cts/pengine/master-1.xml +++ b/cts/pengine/master-1.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-36" name="promotable" value="true"/> <nvpair id="nvpair.meta.auto-37" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/master-10.xml b/cts/pengine/master-10.xml index d0d303ac1..0bd6e9ea0 100644 --- a/cts/pengine/master-10.xml +++ b/cts/pengine/master-10.xml @@ -29,7 +29,6 @@ <op name="monitor" interval="1" id="mon-1"/> <op name="monitor" interval="11" id="mon-2" role="Master"/> </operations> - <meta_attributes id="primitive-child_rsc1.meta"/> </primitive> <meta_attributes id="clone-rsc1.meta"> <nvpair id="promotable.meta.auto-34" name="promotable" value="true"/> diff --git a/cts/pengine/master-11.xml b/cts/pengine/master-11.xml index 9dcf0627d..7872c6146 100644 --- a/cts/pengine/master-11.xml +++ b/cts/pengine/master-11.xml @@ -23,13 +23,9 @@ </node> </nodes> <resources> - <primitive id="simple-rsc" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-simple-rsc.meta"/> - </primitive> + <primitive id="simple-rsc" class="ocf" provider="heartbeat" type="apache"/> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-34" name="promotable" value="true"/> <nvpair id="nvpair.meta.auto-59" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/master-12.xml b/cts/pengine/master-12.xml index d85cb094d..90a4e9e25 100644 --- a/cts/pengine/master-12.xml +++ b/cts/pengine/master-12.xml @@ -25,7 +25,6 @@ <instance_attributes id="instance_attributes.id21946"> <nvpair id="nvpair.id21953" name="drbd_resource" value="drbd0"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> @@ -38,19 +37,15 @@ <nvpair id="nvpair.id22001" name="promoted-node-max" value="1"/> <nvpair id="unique-2" name="globally-unique" value="true"/> </meta_attributes> - <primitive id="sf" class="ocf" provider="heartbeat" type="Stateful"> - <meta_attributes id="primitive-sf.meta"/> - </primitive> + <primitive id="sf" class="ocf" provider="heartbeat" type="Stateful"/> <meta_attributes id="clone-ms-sf.meta"/> </clone> <primitive id="fs0" class="ocf" provider="heartbeat" type="Filesystem"> - <meta_attributes id="meta_attributes.id22041"/> <instance_attributes id="instance_attributes.id22049"> <nvpair id="nvpair.id22055" name="fstype" value="ext3"/> <nvpair id="nvpair.id22064" name="directory" value="/drbd"/> <nvpair id="nvpair.id22072" name="device" value="/dev/drbd0"/> </instance_attributes> - <meta_attributes id="primitive-fs0.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/master-13.xml b/cts/pengine/master-13.xml index f06920708..c4c075980 100644 --- a/cts/pengine/master-13.xml +++ b/cts/pengine/master-13.xml @@ -49,7 +49,6 @@ <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> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms_drbd.meta"/> </clone> @@ -63,13 +62,11 @@ <operations> <op name="monitor" interval="5s" id="IPaddr0_mon" timeout="5s"/> </operations> - <meta_attributes id="primitive-IPaddr0.meta"/> </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> - <meta_attributes id="primitive-MailTo.meta"/> </primitive> <meta_attributes id="group-group.meta"/> </group> diff --git a/cts/pengine/master-2.xml b/cts/pengine/master-2.xml index 20bd74023..0ed407a95 100644 --- a/cts/pengine/master-2.xml +++ b/cts/pengine/master-2.xml @@ -24,9 +24,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="promotable.meta.auto-43" name="promotable" value="true"/> <nvpair id="notify.meta.auto-43" name="notify" value="true"/> diff --git a/cts/pengine/master-3.xml b/cts/pengine/master-3.xml index 9dcf3b9f3..0539e12b4 100644 --- a/cts/pengine/master-3.xml +++ b/cts/pengine/master-3.xml @@ -14,9 +14,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-36" name="promotable" value="true"/> <nvpair id="nvpair.meta.auto-37" name="resource-stickiness" value="1"/> diff --git a/cts/pengine/master-4.xml b/cts/pengine/master-4.xml index 671a25a5b..2da2b6695 100644 --- a/cts/pengine/master-4.xml +++ b/cts/pengine/master-4.xml @@ -43,7 +43,6 @@ <instance_attributes id="instance_attributes.id22075"> <nvpair id="nvpair.id22081" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_child.meta"/> </primitive> <primitive id="heartbeat_child" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -52,7 +51,6 @@ <instance_attributes id="instance_attributes.id22117"> <nvpair id="nvpair.id22123" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_child.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -60,7 +58,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -139,7 +136,6 @@ <instance_attributes id="instance_attributes.id22548"> <nvpair id="nvpair.id22554" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-231" name="promotable" value="true"/> diff --git a/cts/pengine/master-5.xml b/cts/pengine/master-5.xml index 7b8ee93f4..81e521781 100644 --- a/cts/pengine/master-5.xml +++ b/cts/pengine/master-5.xml @@ -43,7 +43,6 @@ <instance_attributes id="instance_attributes.id22075"> <nvpair id="nvpair.id22081" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_child.meta"/> </primitive> <primitive id="heartbeat_child" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -52,7 +51,6 @@ <instance_attributes id="instance_attributes.id22117"> <nvpair id="nvpair.id22123" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_child.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -60,7 +58,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -139,7 +136,6 @@ <instance_attributes id="instance_attributes.id22548"> <nvpair id="nvpair.id22554" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-231" name="promotable" value="true"/> diff --git a/cts/pengine/master-6.xml b/cts/pengine/master-6.xml index 9c2e114ea..c3daf631d 100644 --- a/cts/pengine/master-6.xml +++ b/cts/pengine/master-6.xml @@ -43,7 +43,6 @@ <instance_attributes id="instance_attributes.id22075"> <nvpair id="nvpair.id22081" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -52,7 +51,6 @@ <instance_attributes id="instance_attributes.id22118"> <nvpair id="nvpair.id22124" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -61,7 +59,6 @@ <instance_attributes id="instance_attributes.id22160"> <nvpair id="nvpair.id22166" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -69,7 +66,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -148,7 +144,6 @@ <instance_attributes id="instance_attributes.id22591"> <nvpair id="nvpair.id22597" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-247" name="promotable" value="true"/> diff --git a/cts/pengine/master-7.xml b/cts/pengine/master-7.xml index a3462dfe5..07e8543ee 100644 --- a/cts/pengine/master-7.xml +++ b/cts/pengine/master-7.xml @@ -50,7 +50,6 @@ <instance_attributes id="instance_attributes.id22127"> <nvpair id="nvpair.id22133" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -59,7 +58,6 @@ <instance_attributes id="instance_attributes.id22170"> <nvpair id="nvpair.id22176" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -68,7 +66,6 @@ <instance_attributes id="instance_attributes.id22212"> <nvpair id="nvpair.id22219" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -76,7 +73,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -155,7 +151,6 @@ <instance_attributes id="instance_attributes.id22645"> <nvpair id="nvpair.id22652" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-266" name="promotable" value="true"/> diff --git a/cts/pengine/master-8.xml b/cts/pengine/master-8.xml index 4074c3402..3f4963c38 100644 --- a/cts/pengine/master-8.xml +++ b/cts/pengine/master-8.xml @@ -50,7 +50,6 @@ <instance_attributes id="instance_attributes.id22127"> <nvpair id="nvpair.id22133" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -59,7 +58,6 @@ <instance_attributes id="instance_attributes.id22170"> <nvpair id="nvpair.id22176" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -68,7 +66,6 @@ <instance_attributes id="instance_attributes.id22212"> <nvpair id="nvpair.id22219" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -76,7 +73,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -155,7 +151,6 @@ <instance_attributes id="instance_attributes.id22645"> <nvpair id="nvpair.id22652" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-266" name="promotable" value="true"/> diff --git a/cts/pengine/master-9.xml b/cts/pengine/master-9.xml index 7062007c5..d819c390c 100644 --- a/cts/pengine/master-9.xml +++ b/cts/pengine/master-9.xml @@ -50,7 +50,6 @@ <instance_attributes id="instance_attributes.id22127"> <nvpair id="nvpair.id22133" name="ip" value="127.0.0.11"/> </instance_attributes> - <meta_attributes id="primitive-ocf_127.0.0.11.meta"/> </primitive> <primitive id="heartbeat_127.0.0.12" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -59,7 +58,6 @@ <instance_attributes id="instance_attributes.id22170"> <nvpair id="nvpair.id22176" name="1" value="127.0.0.12"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_127.0.0.12.meta"/> </primitive> <primitive id="ocf_127.0.0.13" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -68,7 +66,6 @@ <instance_attributes id="instance_attributes.id22212"> <nvpair id="nvpair.id22218" name="ip" value="127.0.0.13"/> </instance_attributes> - <meta_attributes id="primitive-ocf_127.0.0.13.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -76,7 +73,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_sgi2" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -155,7 +151,6 @@ <instance_attributes id="instance_attributes.id22645"> <nvpair id="nvpair.id22651" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-266" name="promotable" value="true"/> diff --git a/cts/pengine/master-demote.xml b/cts/pengine/master-demote.xml index 24bcfa8d4..ff50edf00 100644 --- a/cts/pengine/master-demote.xml +++ b/cts/pengine/master-demote.xml @@ -14,21 +14,18 @@ <instance_attributes id="instance_attributes.id21896"> <nvpair name="ip" value="192.168.2.210" id="nvpair.id21903"/> </instance_attributes> - <meta_attributes id="primitive-cyrus_address.meta"/> </primitive> <primitive id="cyrus_master" class="ocf" type="cyrus-imap" provider="heartbeat"> <instance_attributes id="instance_attributes.id21925"> <nvpair id="nvpair.id21932" name="binpath" value="/usr/local/sbin/cyrus_master"/> <nvpair id="nvpair.id21941" name="pidfile" value="/opt/cyrus/var/run/master.pid"/> </instance_attributes> - <meta_attributes id="primitive-cyrus_master.meta"/> </primitive> <primitive id="cyrus_syslogd" class="ocf" type="syslogd" provider="heartbeat"> <instance_attributes id="instance_attributes.id21963"> <nvpair id="nvpair.id21970" name="binpath" value="/usr/local/sbin/cyrus_syslogd"/> <nvpair id="nvpair.id21979" name="pidfile" value="/opt/cyrus/var/run/syslogd.pid"/> </instance_attributes> - <meta_attributes id="primitive-cyrus_syslogd.meta"/> </primitive> <primitive id="cyrus_filesys" class="ocf" type="Filesystem" provider="heartbeat"> <instance_attributes id="instance_attributes.id22002"> @@ -37,13 +34,11 @@ <nvpair id="nvpair.id22026" name="fstype" value="xfs"/> <nvpair id="nvpair.id22035" name="options" value="nobarrier"/> </instance_attributes> - <meta_attributes id="primitive-cyrus_filesys.meta"/> </primitive> <primitive id="cyrus_volgroup" class="ocf" type="VolGroup" provider="heartbeat"> <instance_attributes id="instance_attributes.id22057"> <nvpair id="nvpair.id22064" name="volgrpname" value="vg3"/> </instance_attributes> - <meta_attributes id="primitive-cyrus_volgroup.meta"/> </primitive> <clone id="cyrus_drbd"> <meta_attributes id="meta_attributes.id22080"> @@ -62,7 +57,6 @@ <operations> <op name="monitor" interval="10s" id="cyrus_drbd_mon_master" timeout="5s" role="Master"/> </operations> - <meta_attributes id="primitive-cyrus_drbd_node.meta"/> </primitive> <meta_attributes id="clone-cyrus_drbd.meta"/> </clone> @@ -70,7 +64,6 @@ <instance_attributes id="instance_attributes.id22198"> <nvpair name="ip" value="192.168.1.188" id="nvpair.id22205"/> </instance_attributes> - <meta_attributes id="primitive-named_address.meta"/> </primitive> <primitive id="named_filesys" class="ocf" type="Filesystem" provider="heartbeat"> <instance_attributes id="instance_attributes.id22227"> @@ -79,27 +72,23 @@ <nvpair id="nvpair.id22252" name="fstype" value="xfs"/> <nvpair id="nvpair.id22260" name="options" value="nobarrier"/> </instance_attributes> - <meta_attributes id="primitive-named_filesys.meta"/> </primitive> <primitive id="named_volgroup" class="ocf" type="VolGroup" provider="heartbeat"> <instance_attributes id="instance_attributes.id22283"> <nvpair id="nvpair.id22289" name="volgrpname" value="vg4"/> </instance_attributes> - <meta_attributes id="primitive-named_volgroup.meta"/> </primitive> <primitive id="named_daemon" class="ocf" type="recursor" provider="heartbeat"> <instance_attributes id="instance_attributes.id22312"> <nvpair id="nvpair.id22318" name="binpath" value="/usr/local/sbin/recursor_daemon"/> <nvpair id="nvpair.id22327" name="pidfile" value="/opt/recursor/var/run/pdns_recursor.pid"/> </instance_attributes> - <meta_attributes id="primitive-named_daemon.meta"/> </primitive> <primitive id="named_syslogd" class="ocf" type="syslogd" provider="heartbeat"> <instance_attributes id="instance_attributes.id22350"> <nvpair id="nvpair.id22357" name="binpath" value="/usr/local/sbin/recursor_syslogd"/> <nvpair id="nvpair.id22366" name="pidfile" value="/opt/recursor/var/run/syslogd.pid"/> </instance_attributes> - <meta_attributes id="primitive-named_syslogd.meta"/> </primitive> <clone id="named_drbd"> <meta_attributes id="meta_attributes.id22383"> @@ -118,7 +107,6 @@ <operations> <op name="monitor" interval="10s" id="named_drbd_mon_master" timeout="5s" role="Master"/> </operations> - <meta_attributes id="primitive-named_drbd_node.meta"/> </primitive> <meta_attributes id="clone-named_drbd.meta"/> </clone> @@ -132,7 +120,6 @@ <nvpair id="nvpair.id22561" name="dampen" value="5s"/> <nvpair id="nvpair.id22570" name="multiplier" value="100"/> </instance_attributes> - <meta_attributes id="primitive-pingd_node.meta"/> </primitive> <meta_attributes id="clone-pingd_clone.meta"> <nvpair id="nvpair.meta.auto-237" name="globally-unique" value="false"/> @@ -150,7 +137,6 @@ <nvpair id="nvpair.id22649" name="login" value="admin"/> <nvpair id="nvpair.id22658" name="password" value="xxxxxxxx"/> </instance_attributes> - <meta_attributes id="primitive-fence_node.meta"/> </primitive> <meta_attributes id="clone-fence_clone.meta"/> </clone> diff --git a/cts/pengine/master-depend.xml b/cts/pengine/master-depend.xml index d307e2cdf..610a4c5b6 100644 --- a/cts/pengine/master-depend.xml +++ b/cts/pengine/master-depend.xml @@ -40,7 +40,6 @@ <op name="monitor" interval="59s" id="drbd0-op1" timeout="10s" role="Master"/> <op name="monitor" interval="60s" id="drbd0-op2" timeout="10s" role="Slave"/> </operations> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-drbd.meta"/> </clone> @@ -48,9 +47,7 @@ <meta_attributes id="meta_attributes.id22094"> <nvpair id="nvpair.id22101" name="globally-unique" value="false"/> </meta_attributes> - <primitive id="cman" class="lsb" type="cman"> - <meta_attributes id="primitive-cman.meta"/> - </primitive> + <primitive id="cman" class="lsb" type="cman"/> <meta_attributes id="meta_attributes.id22146"> <nvpair id="nvpair.id22153" name="target-role" value="started"/> </meta_attributes> @@ -67,9 +64,7 @@ <nvpair id="nvpair.id22182" name="target-role" value="started"/> <nvpair id="nvpair.id22191" name="globally-unique" value="false"/> </meta_attributes> - <primitive id="clvmd" class="lsb" type="lxclvmd"> - <meta_attributes id="primitive-clvmd.meta"/> - </primitive> + <primitive id="clvmd" class="lsb" type="lxclvmd"/> <meta_attributes id="clone-clvmd_clone.meta"> <nvpair id="ordered.meta.auto-121" name="ordered" value="false"/> <nvpair id="interleave.meta.auto-121" name="interleave" value="true"/> diff --git a/cts/pengine/master-failed-demote-2.xml b/cts/pengine/master-failed-demote-2.xml index 2e5e67f43..1f7f1ea7a 100644 --- a/cts/pengine/master-failed-demote-2.xml +++ b/cts/pengine/master-failed-demote-2.xml @@ -51,7 +51,6 @@ <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> - <meta_attributes id="primitive-stateful-1.meta"/> </primitive> <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat"> <operations> @@ -60,7 +59,6 @@ <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> - <meta_attributes id="primitive-stateful-2.meta"/> </primitive> <meta_attributes id="group-group.meta"/> </group> diff --git a/cts/pengine/master-failed-demote.xml b/cts/pengine/master-failed-demote.xml index c6c7f213a..c869f3177 100644 --- a/cts/pengine/master-failed-demote.xml +++ b/cts/pengine/master-failed-demote.xml @@ -51,7 +51,6 @@ <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> - <meta_attributes id="primitive-stateful-1.meta"/> </primitive> <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat"> <operations> @@ -60,7 +59,6 @@ <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> - <meta_attributes id="primitive-stateful-2.meta"/> </primitive> <meta_attributes id="group-group.meta"/> </group> diff --git a/cts/pengine/master-group.xml b/cts/pengine/master-group.xml index f9880d5d2..a2f341e11 100644 --- a/cts/pengine/master-group.xml +++ b/cts/pengine/master-group.xml @@ -51,7 +51,6 @@ <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> - <meta_attributes id="primitive-resource_1.meta"/> </primitive> <meta_attributes id="group-test.meta"/> </group> @@ -69,7 +68,6 @@ <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> - <meta_attributes id="primitive-master_slave_Stateful.meta"/> </primitive> <meta_attributes id="group-grp_ms_sf.meta"/> </group> diff --git a/cts/pengine/master-ordering.xml b/cts/pengine/master-ordering.xml index 66fcc8488..f22ec3186 100644 --- a/cts/pengine/master-ordering.xml +++ b/cts/pengine/master-ordering.xml @@ -127,7 +127,6 @@ <nvpair id="nvpair.id22530" name="directory" value="/data/www"/> <nvpair id="nvpair.id22539" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-ocfs2_www.meta"/> </primitive> <meta_attributes id="clone-clone_ocfs2_www.meta"> <nvpair id="nvpair.meta.auto-211" name="target-role" value="started"/> @@ -208,7 +207,6 @@ <nvpair id="nvpair.id22885" name="directory" value="/data/mysql"/> <nvpair id="nvpair.id22893" name="fstype" value="ext3"/> </instance_attributes> - <meta_attributes id="primitive-fs_mysql.meta"/> </primitive> <primitive id="mysql-server" class="ocf" provider="heartbeat" type="mysql"> <operations> diff --git a/cts/pengine/migration-behind-migrating-remote.xml b/cts/pengine/migration-behind-migrating-remote.xml index 1f7d10602..f7859f25a 100644 --- a/cts/pengine/migration-behind-migrating-remote.xml +++ b/cts/pengine/migration-behind-migrating-remote.xml @@ -13,8 +13,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 remote-1 remote-2"/> diff --git a/cts/pengine/mon-rsc-1.xml b/cts/pengine/mon-rsc-1.xml index b6ec5d603..b95c5b661 100644 --- a/cts/pengine/mon-rsc-1.xml +++ b/cts/pengine/mon-rsc-1.xml @@ -17,7 +17,6 @@ <operations> <op name="monitor" interval="5s" id="op.auto-1" timeout="3s"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/mon-rsc-2.xml b/cts/pengine/mon-rsc-2.xml index f6bd109e1..84591265b 100644 --- a/cts/pengine/mon-rsc-2.xml +++ b/cts/pengine/mon-rsc-2.xml @@ -21,7 +21,6 @@ <operations> <op name="monitor" interval="5s" id="op.auto-1" timeout="3s"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/mon-rsc-3.xml b/cts/pengine/mon-rsc-3.xml index 972a971bd..4d686ab52 100644 --- a/cts/pengine/mon-rsc-3.xml +++ b/cts/pengine/mon-rsc-3.xml @@ -18,7 +18,6 @@ <operations> <op name="monitor" interval="5s" id="op.auto-1" timeout="3s"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/mon-rsc-4.xml b/cts/pengine/mon-rsc-4.xml index 6ac7b4e88..2488d7a20 100644 --- a/cts/pengine/mon-rsc-4.xml +++ b/cts/pengine/mon-rsc-4.xml @@ -21,7 +21,6 @@ <operations> <op name="monitor" interval="5s" id="op.auto-1" timeout="3s"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/multi1.xml b/cts/pengine/multi1.xml index 5f718e39b..ec8371957 100644 --- a/cts/pengine/multi1.xml +++ b/cts/pengine/multi1.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/notifs-for-unrunnable.xml b/cts/pengine/notifs-for-unrunnable.xml index 0871a84c6..8f9e8e010 100644 --- a/cts/pengine/notifs-for-unrunnable.xml +++ b/cts/pengine/notifs-for-unrunnable.xml @@ -1,4 +1,4 @@ -<cib crm_feature_set="3.0.14" validate-with="pacemaker-2.8" epoch="100" num_updates="4722" admin_epoch="0" cib-last-written="Tue Feb 13 23:13:28 2018" update-origin="controller-2" update-client="crm_attribute" update-user="redis-bundle-2" have-quorum="1" dc-uuid="2" execution-date="1518565247"> +<cib crm_feature_set="3.0.14" validate-with="pacemaker-3.0" epoch="100" num_updates="4722" admin_epoch="0" cib-last-written="Tue Feb 13 23:13:28 2018" update-origin="controller-2" update-client="crm_attribute" update-user="redis-bundle-2" have-quorum="1" dc-uuid="2" execution-date="1518565247"> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> diff --git a/cts/pengine/notify-0.xml b/cts/pengine/notify-0.xml index bd50d7357..53fc8fa1f 100644 --- a/cts/pengine/notify-0.xml +++ b/cts/pengine/notify-0.xml @@ -13,9 +13,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="nvpair.meta.auto-31" name="clone-max" value="2"/> <nvpair id="nvpair.meta.auto-33" name="clone-node-max" value="2"/> @@ -23,9 +21,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="nvpair.meta.auto-46" name="clone-max" value="2"/> <nvpair id="nvpair.meta.auto-48" name="clone-node-max" value="2"/> diff --git a/cts/pengine/notify-1.xml b/cts/pengine/notify-1.xml index b24586b4c..6f0237144 100644 --- a/cts/pengine/notify-1.xml +++ b/cts/pengine/notify-1.xml @@ -13,9 +13,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="notify.meta.auto-25" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-31" name="clone-max" value="2"/> @@ -24,9 +22,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="notify.meta.auto-40" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-46" name="clone-max" value="2"/> diff --git a/cts/pengine/notify-2.xml b/cts/pengine/notify-2.xml index 28083076f..c6ae2e23f 100644 --- a/cts/pengine/notify-2.xml +++ b/cts/pengine/notify-2.xml @@ -13,9 +13,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="notify.meta.auto-25" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-31" name="clone-max" value="2"/> @@ -24,9 +22,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="notify.meta.auto-40" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-46" name="clone-max" value="2"/> diff --git a/cts/pengine/notify-3.xml b/cts/pengine/notify-3.xml index fd7103bb3..4ac96120b 100644 --- a/cts/pengine/notify-3.xml +++ b/cts/pengine/notify-3.xml @@ -15,9 +15,7 @@ </nodes> <resources> <clone id="rsc1"> - <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc1.meta"/> - </primitive> + <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc1.meta"> <nvpair id="notify.meta.auto-23" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-29" name="clone-max" value="2"/> @@ -26,9 +24,7 @@ </meta_attributes> </clone> <clone id="rsc2"> - <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-child_rsc2.meta"/> - </primitive> + <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="clone-rsc2.meta"> <nvpair id="notify.meta.auto-38" name="notify" value="1"/> <nvpair id="nvpair.meta.auto-44" name="clone-max" value="2"/> diff --git a/cts/pengine/novell-239079.xml b/cts/pengine/novell-239079.xml index bb49cb9c1..eaf2b43bd 100644 --- a/cts/pengine/novell-239079.xml +++ b/cts/pengine/novell-239079.xml @@ -60,7 +60,6 @@ <nvpair id="nvpair.id22186" name="drbd_resource" value="r0"/> <nvpair id="nvpair.id22194" name="clone_overrides_hostname" value="no"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> diff --git a/cts/pengine/novell-239082.xml b/cts/pengine/novell-239082.xml index 4e5ff16e4..af89240da 100644 --- a/cts/pengine/novell-239082.xml +++ b/cts/pengine/novell-239082.xml @@ -60,7 +60,6 @@ <nvpair id="nvpair.id22185" name="drbd_resource" value="r0"/> <nvpair id="nvpair.id22194" name="clone_overrides_hostname" value="no"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> diff --git a/cts/pengine/novell-239087.xml b/cts/pengine/novell-239087.xml index 6af3abaeb..ee43099fe 100644 --- a/cts/pengine/novell-239087.xml +++ b/cts/pengine/novell-239087.xml @@ -60,7 +60,6 @@ <nvpair id="nvpair.id22186" name="drbd_resource" value="r0"/> <nvpair id="nvpair.id22194" name="clone_overrides_hostname" value="no"/> </instance_attributes> - <meta_attributes id="primitive-drbd0.meta"/> </primitive> <meta_attributes id="clone-ms-drbd0.meta"/> </clone> diff --git a/cts/pengine/novell-251689.xml b/cts/pengine/novell-251689.xml index 387b8366d..bf034979c 100644 --- a/cts/pengine/novell-251689.xml +++ b/cts/pengine/novell-251689.xml @@ -39,7 +39,6 @@ <operations> <op name="monitor" interval="5s" id="evmsdclone-op-01" timeout="20s"/> </operations> - <meta_attributes id="primitive-evmsdclone.meta"/> </primitive> <meta_attributes id="clone-evmsdcloneset.meta"> <nvpair id="notify.meta.auto-68" name="notify" value="false"/> @@ -48,9 +47,7 @@ </meta_attributes> </clone> <clone id="evmscloneset"> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"> <nvpair id="notify.meta.auto-87" name="notify" value="true"/> <nvpair id="globally_unique.meta.auto-87" name="globally-unique" value="false"/> @@ -67,7 +64,6 @@ <nvpair id="nvpair.id22195" name="directory" value="/var/lib/xen/images"/> <nvpair id="nvpair.id22204" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"> <nvpair id="notify.meta.auto-100" name="notify" value="true"/> @@ -86,7 +82,6 @@ <nvpair id="nvpair.id22294" name="directory" value="/etc/xen/vm"/> <nvpair id="nvpair.id22303" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"> <nvpair id="notify.meta.auto-133" name="notify" value="true"/> diff --git a/cts/pengine/novell-252693-2.xml b/cts/pengine/novell-252693-2.xml index 0c4151484..68fc09db3 100644 --- a/cts/pengine/novell-252693-2.xml +++ b/cts/pengine/novell-252693-2.xml @@ -25,7 +25,6 @@ <instance_attributes id="instance_attributes.id22008"> <nvpair id="nvpair.id22014" name="hostlist" value="node1,node2"/> </instance_attributes> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"> <nvpair id="globally_unique.meta.auto-39" name="globally-unique" value="false"/> @@ -38,7 +37,6 @@ <operations> <op name="monitor" interval="5s" id="evmsdclone-op-01" timeout="20s"/> </operations> - <meta_attributes id="primitive-evmsdclone.meta"/> </primitive> <meta_attributes id="clone-evmsdcloneset.meta"> <nvpair id="notify.meta.auto-68" name="notify" value="false"/> @@ -47,9 +45,7 @@ </meta_attributes> </clone> <clone id="evmscloneset"> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"> <nvpair id="notify.meta.auto-87" name="notify" value="true"/> <nvpair id="globally_unique.meta.auto-87" name="globally-unique" value="false"/> @@ -67,7 +63,6 @@ <nvpair id="nvpair.id22204" name="directory" value="/var/lib/xen/images"/> <nvpair id="nvpair.id22213" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"> <nvpair id="notify.meta.auto-100" name="notify" value="true"/> @@ -87,7 +82,6 @@ <nvpair id="nvpair.id22312" name="directory" value="/etc/xen/vm"/> <nvpair id="nvpair.id22321" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"> <nvpair id="notify.meta.auto-135" name="notify" value="true"/> @@ -107,7 +101,6 @@ <meta_attributes id="meta_attributes.id22385"> <nvpair id="nvpair.id22392" name="allow-migrate" value="true"/> </meta_attributes> - <meta_attributes id="primitive-sles10.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/novell-252693-3.xml b/cts/pengine/novell-252693-3.xml index 7bfbeed5a..8c5002bcf 100644 --- a/cts/pengine/novell-252693-3.xml +++ b/cts/pengine/novell-252693-3.xml @@ -25,7 +25,6 @@ <instance_attributes id="instance_attributes.id22008"> <nvpair id="nvpair.id22014" name="hostlist" value="node1,node2"/> </instance_attributes> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"> <nvpair id="globally_unique.meta.auto-39" name="globally-unique" value="false"/> @@ -38,7 +37,6 @@ <operations> <op name="monitor" interval="5s" id="evmsdclone-op-01" timeout="20s"/> </operations> - <meta_attributes id="primitive-evmsdclone.meta"/> </primitive> <meta_attributes id="clone-evmsdcloneset.meta"> <nvpair id="notify.meta.auto-68" name="notify" value="false"/> @@ -47,9 +45,7 @@ </meta_attributes> </clone> <clone id="evmscloneset"> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"> <nvpair id="notify.meta.auto-87" name="notify" value="true"/> <nvpair id="globally_unique.meta.auto-87" name="globally-unique" value="false"/> @@ -67,7 +63,6 @@ <nvpair id="nvpair.id22213" name="directory" value="/var/lib/xen/images"/> <nvpair id="nvpair.id22222" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"> <nvpair id="notify.meta.auto-100" name="notify" value="true"/> @@ -88,7 +83,6 @@ <nvpair id="nvpair.id22321" name="directory" value="/etc/xen/vm"/> <nvpair id="nvpair.id22330" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"> <nvpair id="notify.meta.auto-137" name="notify" value="true"/> @@ -108,7 +102,6 @@ <meta_attributes id="meta_attributes.id22394"> <nvpair id="nvpair.id22401" name="allow-migrate" value="true"/> </meta_attributes> - <meta_attributes id="primitive-sles10.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/novell-252693.xml b/cts/pengine/novell-252693.xml index c48fe7710..ae9191f97 100644 --- a/cts/pengine/novell-252693.xml +++ b/cts/pengine/novell-252693.xml @@ -25,7 +25,6 @@ <instance_attributes id="instance_attributes.id22007"> <nvpair id="nvpair.id22014" name="hostlist" value="node1,node2"/> </instance_attributes> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"> <nvpair id="globally_unique.meta.auto-39" name="globally-unique" value="false"/> @@ -38,7 +37,6 @@ <operations> <op name="monitor" interval="5s" id="evmsdclone-op-01" timeout="20s"/> </operations> - <meta_attributes id="primitive-evmsdclone.meta"/> </primitive> <meta_attributes id="clone-evmsdcloneset.meta"> <nvpair id="notify.meta.auto-68" name="notify" value="false"/> @@ -47,9 +45,7 @@ </meta_attributes> </clone> <clone id="evmscloneset"> - <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"> - <meta_attributes id="primitive-evmsclone.meta"/> - </primitive> + <primitive id="evmsclone" class="ocf" type="EvmsSCC" provider="heartbeat"/> <meta_attributes id="clone-evmscloneset.meta"> <nvpair id="notify.meta.auto-87" name="notify" value="true"/> <nvpair id="globally_unique.meta.auto-87" name="globally-unique" value="false"/> @@ -66,7 +62,6 @@ <nvpair id="nvpair.id22195" name="directory" value="/var/lib/xen/images"/> <nvpair id="nvpair.id22204" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"> <nvpair id="notify.meta.auto-100" name="notify" value="true"/> @@ -85,7 +80,6 @@ <nvpair id="nvpair.id22294" name="directory" value="/etc/xen/vm"/> <nvpair id="nvpair.id22303" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"> <nvpair id="notify.meta.auto-133" name="notify" value="true"/> @@ -106,7 +100,6 @@ <meta_attributes id="meta_attributes.id22368"> <nvpair id="nvpair.id22374" name="allow-migrate" value="true"/> </meta_attributes> - <meta_attributes id="primitive-sles10.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/one-or-more-unrunnable-instances.xml b/cts/pengine/one-or-more-unrunnable-instances.xml index ab4d32859..5286868e7 100644 --- a/cts/pengine/one-or-more-unrunnable-instances.xml +++ b/cts/pengine/one-or-more-unrunnable-instances.xml @@ -74,7 +74,6 @@ <operations> <op id="lb-haproxy-monitor-start-delay-10s" interval="60s" name="monitor" start-delay="10s"/> </operations> - <meta_attributes id="lb-haproxy-meta_attributes"/> </primitive> <meta_attributes id="lb-haproxy-clone-meta"/> </clone> @@ -237,7 +236,6 @@ <op id="galera-demote-timeout-120" interval="0s" name="demote" timeout="120"/> <op id="galera-promote-timeout-300s-on-fail-block" interval="0s" name="promote" on-fail="block" timeout="300s"/> </operations> - <meta_attributes id="galera-meta_attributes"/> </primitive> <meta_attributes id="galera-master-meta_attributes"> <nvpair id="galera-master-meta_attributes-promotable" name="promotable" value="true"/> @@ -699,7 +697,6 @@ <operations> <op id="neutron-openvswitch-agent-compute-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="neutron-openvswitch-agent-compute-meta_attributes"/> </primitive> <meta_attributes id="neutron-openvswitch-agent-compute-clone-meta"> <nvpair id="neutron-openvswitch-agent-compute-interleave" name="interleave" value="true"/> @@ -710,7 +707,6 @@ <operations> <op id="libvirtd-compute-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="libvirtd-compute-meta_attributes"/> </primitive> <meta_attributes id="libvirtd-compute-clone-meta"> <nvpair id="libvirtd-compute-interleave" name="interleave" value="true"/> @@ -721,7 +717,6 @@ <operations> <op id="ceilometer-compute-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="ceilometer-compute-meta_attributes"/> </primitive> <meta_attributes id="ceilometer-compute-clone-meta"> <nvpair id="ceilometer-compute-interleave" name="interleave" value="true"/> @@ -768,7 +763,6 @@ <op id="mrg-07-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="mrg-07-monitor-timeout-30" interval="60s" name="monitor" timeout="30"/> </operations> - <meta_attributes id="mrg-07-meta_attributes"/> </primitive> <primitive class="ocf" id="mrg-08" provider="pacemaker" type="remote"> <operations> @@ -776,7 +770,6 @@ <op id="mrg-08-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="mrg-08-monitor-timeout-30" interval="60s" name="monitor" timeout="30"/> </operations> - <meta_attributes id="mrg-08-meta_attributes"/> </primitive> <primitive class="ocf" id="mrg-09" provider="pacemaker" type="remote"> <operations> @@ -784,7 +777,6 @@ <op id="mrg-09-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="mrg-09-monitor-timeout-30" interval="60s" name="monitor" timeout="30"/> </operations> - <meta_attributes id="mrg-09-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/order-expired-failure.xml b/cts/pengine/order-expired-failure.xml index 9e8426ed9..67491a2af 100644 --- a/cts/pengine/order-expired-failure.xml +++ b/cts/pengine/order-expired-failure.xml @@ -1,4 +1,4 @@ -<cib crm_feature_set="3.0.14" validate-with="pacemaker-2.10" epoch="104" num_updates="12" admin_epoch="0" cib-last-written="Mon Apr 9 06:28:41 2018" update-origin="controller-0" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2" execution-date="1523260535"> +<cib crm_feature_set="3.0.14" validate-with="pacemaker-3.0" epoch="104" num_updates="12" admin_epoch="0" cib-last-written="Mon Apr 9 06:28:41 2018" update-origin="controller-0" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2" execution-date="1523260535"> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> diff --git a/cts/pengine/order-mandatory.xml b/cts/pengine/order-mandatory.xml index 9f50897cc..a75a526b9 100644 --- a/cts/pengine/order-mandatory.xml +++ b/cts/pengine/order-mandatory.xml @@ -18,18 +18,10 @@ <node id="uuid1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" kind="Mandatory"/> diff --git a/cts/pengine/order-optional-keyword.xml b/cts/pengine/order-optional-keyword.xml index 0b3c59f28..830f3530b 100644 --- a/cts/pengine/order-optional-keyword.xml +++ b/cts/pengine/order-optional-keyword.xml @@ -18,18 +18,10 @@ <node id="uuid1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" kind="Optional"/> diff --git a/cts/pengine/order-optional.xml b/cts/pengine/order-optional.xml index 5562b941d..6b9e19755 100644 --- a/cts/pengine/order-optional.xml +++ b/cts/pengine/order-optional.xml @@ -18,18 +18,10 @@ <node id="uuid1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/order-required.xml b/cts/pengine/order-required.xml index 653268e5a..5ee633b49 100644 --- a/cts/pengine/order-required.xml +++ b/cts/pengine/order-required.xml @@ -18,18 +18,10 @@ <node id="uuid1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="INFINITY"/> diff --git a/cts/pengine/order1.xml b/cts/pengine/order1.xml index 4531c5be0..07d881086 100644 --- a/cts/pengine/order1.xml +++ b/cts/pengine/order1.xml @@ -13,15 +13,9 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/order2.xml b/cts/pengine/order2.xml index da4a6a20d..64d6564de 100644 --- a/cts/pengine/order2.xml +++ b/cts/pengine/order2.xml @@ -13,18 +13,10 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/order3.xml b/cts/pengine/order3.xml index c4d6813d4..37721327a 100644 --- a/cts/pengine/order3.xml +++ b/cts/pengine/order3.xml @@ -14,18 +14,10 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/order4.xml b/cts/pengine/order4.xml index e04d32a34..270b5c584 100644 --- a/cts/pengine/order4.xml +++ b/cts/pengine/order4.xml @@ -13,15 +13,9 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/order5.xml b/cts/pengine/order5.xml index 006876d7c..c64e87d12 100644 --- a/cts/pengine/order5.xml +++ b/cts/pengine/order5.xml @@ -13,30 +13,14 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> - <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> - <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc6.meta"/> - </primitive> - <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc7.meta"/> - </primitive> - <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc8.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" score="0"/> diff --git a/cts/pengine/order6.xml b/cts/pengine/order6.xml index 61f7ced38..ae4e9ff0e 100644 --- a/cts/pengine/order6.xml +++ b/cts/pengine/order6.xml @@ -13,9 +13,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <meta_attributes id="primitive-rsc2.meta"> <nvpair id="restart_type.meta.auto-23" name="restart-type" value="restart"/> @@ -26,12 +24,8 @@ <nvpair id="restart_type.meta.auto-25" name="restart-type" value="restart"/> </meta_attributes> </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> - <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/> <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"> <meta_attributes id="primitive-rsc6.meta"> <nvpair id="restart_type.meta.auto-31" name="restart-type" value="restart"/> @@ -42,9 +36,7 @@ <nvpair id="restart_type.meta.auto-33" name="restart-type" value="restart"/> </meta_attributes> </primitive> - <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc8.meta"/> - </primitive> + <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" score="0"/> diff --git a/cts/pengine/order7.xml b/cts/pengine/order7.xml index 9b434ed7d..c313f2b90 100644 --- a/cts/pengine/order7.xml +++ b/cts/pengine/order7.xml @@ -10,24 +10,12 @@ <node id="uuid1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rscA" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rscA.meta"/> - </primitive> - <primitive id="rscB" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rscB.meta"/> - </primitive> - <primitive id="rscC" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rscC.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rscA" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rscB" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rscC" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/> diff --git a/cts/pengine/params-2.xml b/cts/pengine/params-2.xml index 66cfd77d7..ce2cf6150 100644 --- a/cts/pengine/params-2.xml +++ b/cts/pengine/params-2.xml @@ -15,15 +15,9 @@ <node id="node3" uname="node3" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="lsb" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="lsb" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> - <primitive id="rsc3" class="lsb" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc1" class="lsb" type="apache"/> + <primitive id="rsc2" class="lsb" type="apache"/> + <primitive id="rsc3" class="lsb" type="apache"/> </resources> <constraints> <rsc_location id="cons1" rsc="rsc1"> diff --git a/cts/pengine/probe-0.xml b/cts/pengine/probe-0.xml index d1363ba2d..b49dc5847 100644 --- a/cts/pengine/probe-0.xml +++ b/cts/pengine/probe-0.xml @@ -30,7 +30,6 @@ <instance_attributes id="instance_attributes.id22022"> <nvpair id="nvpair.id22029" name="hostlist" value="32c47,32c48"/> </instance_attributes> - <meta_attributes id="primitive-stonithclone.meta"/> </primitive> <meta_attributes id="clone-stonithcloneset.meta"> <nvpair id="globally_unique.meta.auto-43" name="globally-unique" value="false"/> @@ -45,7 +44,6 @@ <nvpair id="nvpair.id22103" name="directory" value="/images"/> <nvpair id="nvpair.id22112" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-imagestoreclone.meta"/> </primitive> <meta_attributes id="clone-imagestorecloneset.meta"> <nvpair id="notify.meta.auto-72" name="notify" value="true"/> @@ -61,7 +59,6 @@ <nvpair id="nvpair.id22186" name="directory" value="/vm"/> <nvpair id="nvpair.id22194" name="fstype" value="ocfs2"/> </instance_attributes> - <meta_attributes id="primitive-configstoreclone.meta"/> </primitive> <meta_attributes id="clone-configstorecloneset.meta"> <nvpair id="notify.meta.auto-100" name="notify" value="true"/> diff --git a/cts/pengine/quorum-1.xml b/cts/pengine/quorum-1.xml index 9da003ee8..43b0ca6e8 100644 --- a/cts/pengine/quorum-1.xml +++ b/cts/pengine/quorum-1.xml @@ -17,19 +17,16 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-3" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc3.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/quorum-2.xml b/cts/pengine/quorum-2.xml index 869bb547c..203dfc119 100644 --- a/cts/pengine/quorum-2.xml +++ b/cts/pengine/quorum-2.xml @@ -17,19 +17,16 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-3" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc3.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/quorum-3.xml b/cts/pengine/quorum-3.xml index bf94f8a3c..9a2d5b8b5 100644 --- a/cts/pengine/quorum-3.xml +++ b/cts/pengine/quorum-3.xml @@ -17,19 +17,16 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-3" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc3.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-1.xml b/cts/pengine/rec-node-1.xml index 2964c32d9..6bcdd1418 100644 --- a/cts/pengine/rec-node-1.xml +++ b/cts/pengine/rec-node-1.xml @@ -15,13 +15,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-10.xml b/cts/pengine/rec-node-10.xml index a69a9b243..ce81bf33d 100644 --- a/cts/pengine/rec-node-10.xml +++ b/cts/pengine/rec-node-10.xml @@ -16,13 +16,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-11.xml b/cts/pengine/rec-node-11.xml index c2b1da89a..e964f22a4 100644 --- a/cts/pengine/rec-node-11.xml +++ b/cts/pengine/rec-node-11.xml @@ -17,13 +17,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <meta_attributes id="group-group1.meta"> <nvpair id="restart_type.meta.auto-23" name="restart-type" value="restart"/> diff --git a/cts/pengine/rec-node-13.xml b/cts/pengine/rec-node-13.xml index ffb87e907..e1cc5e96a 100644 --- a/cts/pengine/rec-node-13.xml +++ b/cts/pengine/rec-node-13.xml @@ -72,7 +72,6 @@ <instance_attributes id="instance_attributes.id22239"> <nvpair id="nvpair.id22245" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -81,7 +80,6 @@ <instance_attributes id="instance_attributes.id22282"> <nvpair id="nvpair.id22288" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -90,7 +88,6 @@ <instance_attributes id="instance_attributes.id22324"> <nvpair id="nvpair.id22330" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -98,7 +95,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n05" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -181,7 +177,6 @@ <instance_attributes id="instance_attributes.id22772"> <nvpair id="nvpair.id22778" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-304" name="promotable" value="true"/> diff --git a/cts/pengine/rec-node-14.xml b/cts/pengine/rec-node-14.xml index 794bef4d2..60307ba53 100644 --- a/cts/pengine/rec-node-14.xml +++ b/cts/pengine/rec-node-14.xml @@ -13,9 +13,7 @@ </nodes> <resources> <primitive id="stonith-1" class="stonith" type="dummy"/> - <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"> - <meta_attributes id="primitive-lsb_dummy.meta"/> - </primitive> + <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/rec-node-15.xml b/cts/pengine/rec-node-15.xml index c7dec043b..809ffa680 100644 --- a/cts/pengine/rec-node-15.xml +++ b/cts/pengine/rec-node-15.xml @@ -36,7 +36,6 @@ <instance_attributes id="instance_attributes.id22063"> <nvpair id="nvpair.id22070" name="ip" value="192.168.1.101"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_101.meta"/> </primitive> <primitive id="LVM_2" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -45,7 +44,6 @@ <instance_attributes id="instance_attributes.id22105"> <nvpair id="nvpair.id22112" name="volgrpname" value="data01vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_2.meta"/> </primitive> <primitive id="Filesystem_3" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -56,7 +54,6 @@ <nvpair id="nvpair.id22164" name="directory" value="/data/d1"/> <nvpair id="nvpair.id22172" name="fstype" value="xfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_3.meta"/> </primitive> <meta_attributes id="group-app01.meta"/> </group> @@ -68,7 +65,6 @@ <instance_attributes id="instance_attributes.id22214"> <nvpair id="nvpair.id22221" name="ip" value="192.168.1.102"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_102.meta"/> </primitive> <primitive id="LVM_12" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -77,7 +73,6 @@ <instance_attributes id="instance_attributes.id22256"> <nvpair id="nvpair.id22263" name="volgrpname" value="data02vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_12.meta"/> </primitive> <primitive id="Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -88,7 +83,6 @@ <nvpair id="nvpair.id22314" name="directory" value="/data/d2"/> <nvpair id="nvpair.id22323" name="fstype" value="ext3"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_13.meta"/> </primitive> <meta_attributes id="group-app02.meta"/> </group> @@ -100,7 +94,6 @@ <instance_attributes id="instance_attributes.id22365"> <nvpair id="nvpair.id22372" name="ip" value="192.168.1.104"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_104.meta"/> </primitive> <primitive id="LVM_22" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -109,7 +102,6 @@ <instance_attributes id="instance_attributes.id22407"> <nvpair id="nvpair.id22414" name="volgrpname" value="data03vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_22.meta"/> </primitive> <primitive id="Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -120,7 +112,6 @@ <nvpair id="nvpair.id22465" name="directory" value="/data/d3"/> <nvpair id="nvpair.id22474" name="fstype" value="xfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_23.meta"/> </primitive> <primitive id="oracle_24" class="ocf" provider="heartbeat" type="oracle"> <operations> @@ -129,7 +120,6 @@ <instance_attributes id="instance_attributes.id22510"> <nvpair id="nvpair.id22517" name="sid" value="testdb"/> </instance_attributes> - <meta_attributes id="primitive-oracle_24.meta"/> </primitive> <primitive id="oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"> <operations> @@ -138,7 +128,6 @@ <instance_attributes id="instance_attributes.id22552"> <nvpair id="nvpair.id22559" name="sid" value="testdb"/> </instance_attributes> - <meta_attributes id="primitive-oralsnr_25.meta"/> </primitive> <meta_attributes id="group-oracle.meta"/> </group> diff --git a/cts/pengine/rec-node-2.xml b/cts/pengine/rec-node-2.xml index abcb48b97..ebd09f6fe 100644 --- a/cts/pengine/rec-node-2.xml +++ b/cts/pengine/rec-node-2.xml @@ -26,7 +26,6 @@ <op name="stop" interval="0" id="stop-2" on-fail="block"/> <op name="start" interval="0" id="start-2"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <group id="group1"> <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> @@ -37,9 +36,7 @@ <nvpair id="nvpair2-requires" name="requires" value="quorum"/> </meta_attributes> </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-group1.meta"/> </group> <group id="group2"> @@ -47,11 +44,8 @@ <operations> <op name="start" interval="0" id="op.auto-6"/> </operations> - <meta_attributes id="primitive-rsc5.meta"/> - </primitive> - <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc6.meta"/> </primitive> + <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-group2.meta"/> </group> </resources> diff --git a/cts/pengine/rec-node-3.xml b/cts/pengine/rec-node-3.xml index 43ee95a47..ba81f1c1d 100644 --- a/cts/pengine/rec-node-3.xml +++ b/cts/pengine/rec-node-3.xml @@ -15,13 +15,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-4.xml b/cts/pengine/rec-node-4.xml index 5235c8951..23105721d 100644 --- a/cts/pengine/rec-node-4.xml +++ b/cts/pengine/rec-node-4.xml @@ -16,13 +16,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-5.xml b/cts/pengine/rec-node-5.xml index 4e1536fb5..a8cfc0018 100644 --- a/cts/pengine/rec-node-5.xml +++ b/cts/pengine/rec-node-5.xml @@ -15,13 +15,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-6.xml b/cts/pengine/rec-node-6.xml index 76f25f18b..857853fd7 100644 --- a/cts/pengine/rec-node-6.xml +++ b/cts/pengine/rec-node-6.xml @@ -16,13 +16,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-7.xml b/cts/pengine/rec-node-7.xml index 5235c8951..23105721d 100644 --- a/cts/pengine/rec-node-7.xml +++ b/cts/pengine/rec-node-7.xml @@ -16,13 +16,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-8.xml b/cts/pengine/rec-node-8.xml index c117e777f..4e64d401d 100644 --- a/cts/pengine/rec-node-8.xml +++ b/cts/pengine/rec-node-8.xml @@ -16,19 +16,16 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-3" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc3.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-node-9.xml b/cts/pengine/rec-node-9.xml index d3a093043..a77b836ec 100644 --- a/cts/pengine/rec-node-9.xml +++ b/cts/pengine/rec-node-9.xml @@ -15,13 +15,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-rsc-2.xml b/cts/pengine/rec-rsc-2.xml index 7f84fc15c..be8112370 100644 --- a/cts/pengine/rec-rsc-2.xml +++ b/cts/pengine/rec-rsc-2.xml @@ -14,9 +14,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/rec-rsc-3.xml b/cts/pengine/rec-rsc-3.xml index d79fde652..d7ab4fb23 100644 --- a/cts/pengine/rec-rsc-3.xml +++ b/cts/pengine/rec-rsc-3.xml @@ -17,7 +17,6 @@ <operations> <op name="stop" interval="0" id="rsc1-stop" on-fail="ignore"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-rsc-4.xml b/cts/pengine/rec-rsc-4.xml index afc623354..4a314c025 100644 --- a/cts/pengine/rec-rsc-4.xml +++ b/cts/pengine/rec-rsc-4.xml @@ -17,7 +17,6 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="block"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-rsc-5.xml b/cts/pengine/rec-rsc-5.xml index 59903f471..232f19bf7 100644 --- a/cts/pengine/rec-rsc-5.xml +++ b/cts/pengine/rec-rsc-5.xml @@ -16,13 +16,11 @@ <operations> <op name="stop" interval="0" id="stop-1" on-fail="fence"/> </operations> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <operations> <op name="stop" interval="0" id="stop-2" on-fail="fence"/> </operations> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/rec-rsc-9.xml b/cts/pengine/rec-rsc-9.xml index ac3374300..0817f417f 100644 --- a/cts/pengine/rec-rsc-9.xml +++ b/cts/pengine/rec-rsc-9.xml @@ -27,17 +27,13 @@ <meta_attributes id="meta_attributes.id21894"> <nvpair id="nvpair.id21901" name="restart-type" value="restart"/> </meta_attributes> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-foo.meta"> <nvpair id="restart_type.meta.auto-25" name="restart-type" value="restart"/> </meta_attributes> </group> <group id="bar"> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-bar.meta"/> </group> </resources> diff --git a/cts/pengine/reload-becomes-restart.xml b/cts/pengine/reload-becomes-restart.xml index 601033df5..7fbead5b5 100644 --- a/cts/pengine/reload-becomes-restart.xml +++ b/cts/pengine/reload-becomes-restart.xml @@ -15,8 +15,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2"/> @@ -27,7 +25,6 @@ </primitive> <clone id="cl-rsc1"> <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"> - <meta_attributes id="rsc1-meta"/> <operations> <op name="monitor" interval="120" timeout="60" id="rsc1-monitor-120"/> </operations> diff --git a/cts/pengine/remote-fence-unclean.xml b/cts/pengine/remote-fence-unclean.xml index 5dd2c85e9..e6663ca70 100644 --- a/cts/pengine/remote-fence-unclean.xml +++ b/cts/pengine/remote-fence-unclean.xml @@ -21,7 +21,6 @@ <operations> <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="remote1-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> <operations> diff --git a/cts/pengine/remote-move.xml b/cts/pengine/remote-move.xml index b5083d461..9e8c760ef 100644 --- a/cts/pengine/remote-move.xml +++ b/cts/pengine/remote-move.xml @@ -21,7 +21,6 @@ <operations> <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="remote1-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> <operations> diff --git a/cts/pengine/remote-reconnect-delay.xml b/cts/pengine/remote-reconnect-delay.xml index 9ad3f739c..3401ff4f8 100644 --- a/cts/pengine/remote-reconnect-delay.xml +++ b/cts/pengine/remote-reconnect-delay.xml @@ -181,7 +181,6 @@ <operations> <op id="remote-rsc-monitor-interval-10s" interval="10s" name="monitor"/> </operations> - <meta_attributes id="remote-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-recover-all.xml b/cts/pengine/remote-recover-all.xml index 9fe38e61d..0ade7cd57 100644 --- a/cts/pengine/remote-recover-all.xml +++ b/cts/pengine/remote-recover-all.xml @@ -201,7 +201,6 @@ <nvpair id="ip-192.168.24.6-instance_attributes-ip" name="ip" value="192.168.24.6"/> <nvpair id="ip-192.168.24.6-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-192.168.24.6-meta_attributes"/> <operations> <op id="ip-192.168.24.6-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-192.168.24.6-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -213,7 +212,6 @@ <nvpair id="ip-10.0.0.102-instance_attributes-ip" name="ip" value="10.0.0.102"/> <nvpair id="ip-10.0.0.102-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-10.0.0.102-meta_attributes"/> <operations> <op id="ip-10.0.0.102-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-10.0.0.102-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -225,7 +223,6 @@ <nvpair id="ip-172.17.1.14-instance_attributes-ip" name="ip" value="172.17.1.14"/> <nvpair id="ip-172.17.1.14-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.14-meta_attributes"/> <operations> <op id="ip-172.17.1.14-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.14-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -237,7 +234,6 @@ <nvpair id="ip-172.17.1.17-instance_attributes-ip" name="ip" value="172.17.1.17"/> <nvpair id="ip-172.17.1.17-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.17-meta_attributes"/> <operations> <op id="ip-172.17.1.17-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.17-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -249,7 +245,6 @@ <nvpair id="ip-172.17.3.15-instance_attributes-ip" name="ip" value="172.17.3.15"/> <nvpair id="ip-172.17.3.15-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.3.15-meta_attributes"/> <operations> <op id="ip-172.17.3.15-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.3.15-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -261,7 +256,6 @@ <nvpair id="ip-172.17.4.11-instance_attributes-ip" name="ip" value="172.17.4.11"/> <nvpair id="ip-172.17.4.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.4.11-meta_attributes"/> <operations> <op id="ip-172.17.4.11-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.4.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -270,7 +264,6 @@ </primitive> <clone id="haproxy-clone"> <primitive class="systemd" id="haproxy" type="haproxy"> - <meta_attributes id="haproxy-meta_attributes"/> <operations> <op id="haproxy-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="haproxy-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -280,7 +273,6 @@ <meta_attributes id="haproxy-clone-meta_attributes"/> </clone> <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume"> - <meta_attributes id="openstack-cinder-volume-meta_attributes"/> <operations> <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -301,7 +293,6 @@ <operations> <op id="stonith-fence_ipmilan-525400bbf613-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400bbf613-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-525400b4f6bd" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-525400b4f6bd-instance_attributes"> @@ -317,7 +308,6 @@ <operations> <op id="stonith-fence_ipmilan-525400b4f6bd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400b4f6bd-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-5254005bdbb5" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-5254005bdbb5-instance_attributes"> @@ -333,7 +323,6 @@ <operations> <op id="stonith-fence_ipmilan-5254005bdbb5-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-5254005bdbb5-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-recover-connection.xml b/cts/pengine/remote-recover-connection.xml index 845b23958..90249158f 100644 --- a/cts/pengine/remote-recover-connection.xml +++ b/cts/pengine/remote-recover-connection.xml @@ -201,7 +201,6 @@ <nvpair id="ip-192.168.24.6-instance_attributes-ip" name="ip" value="192.168.24.6"/> <nvpair id="ip-192.168.24.6-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-192.168.24.6-meta_attributes"/> <operations> <op id="ip-192.168.24.6-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-192.168.24.6-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -213,7 +212,6 @@ <nvpair id="ip-10.0.0.102-instance_attributes-ip" name="ip" value="10.0.0.102"/> <nvpair id="ip-10.0.0.102-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-10.0.0.102-meta_attributes"/> <operations> <op id="ip-10.0.0.102-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-10.0.0.102-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -225,7 +223,6 @@ <nvpair id="ip-172.17.1.14-instance_attributes-ip" name="ip" value="172.17.1.14"/> <nvpair id="ip-172.17.1.14-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.14-meta_attributes"/> <operations> <op id="ip-172.17.1.14-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.14-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -237,7 +234,6 @@ <nvpair id="ip-172.17.1.17-instance_attributes-ip" name="ip" value="172.17.1.17"/> <nvpair id="ip-172.17.1.17-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.17-meta_attributes"/> <operations> <op id="ip-172.17.1.17-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.17-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -249,7 +245,6 @@ <nvpair id="ip-172.17.3.15-instance_attributes-ip" name="ip" value="172.17.3.15"/> <nvpair id="ip-172.17.3.15-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.3.15-meta_attributes"/> <operations> <op id="ip-172.17.3.15-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.3.15-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -261,7 +256,6 @@ <nvpair id="ip-172.17.4.11-instance_attributes-ip" name="ip" value="172.17.4.11"/> <nvpair id="ip-172.17.4.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.4.11-meta_attributes"/> <operations> <op id="ip-172.17.4.11-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.4.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -270,7 +264,6 @@ </primitive> <clone id="haproxy-clone"> <primitive class="systemd" id="haproxy" type="haproxy"> - <meta_attributes id="haproxy-meta_attributes"/> <operations> <op id="haproxy-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="haproxy-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -280,7 +273,6 @@ <meta_attributes id="haproxy-clone-meta_attributes"/> </clone> <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume"> - <meta_attributes id="openstack-cinder-volume-meta_attributes"/> <operations> <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -301,7 +293,6 @@ <operations> <op id="stonith-fence_ipmilan-525400bbf613-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400bbf613-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-525400b4f6bd" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-525400b4f6bd-instance_attributes"> @@ -317,7 +308,6 @@ <operations> <op id="stonith-fence_ipmilan-525400b4f6bd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400b4f6bd-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-5254005bdbb5" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-5254005bdbb5-instance_attributes"> @@ -333,7 +323,6 @@ <operations> <op id="stonith-fence_ipmilan-5254005bdbb5-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-5254005bdbb5-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-recover-fail.xml b/cts/pengine/remote-recover-fail.xml index 115fc1547..aeac5eed1 100644 --- a/cts/pengine/remote-recover-fail.xml +++ b/cts/pengine/remote-recover-fail.xml @@ -26,7 +26,6 @@ <op id="rhel7-auto4-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="rhel7-auto4-monitor-timeout-30" interval="60s" name="monitor" timeout="30"/> </operations> - <meta_attributes id="rhel7-auto4-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> <operations> diff --git a/cts/pengine/remote-recover-no-resources.xml b/cts/pengine/remote-recover-no-resources.xml index a9e55fb75..37708bb7a 100644 --- a/cts/pengine/remote-recover-no-resources.xml +++ b/cts/pengine/remote-recover-no-resources.xml @@ -201,7 +201,6 @@ <nvpair id="ip-192.168.24.6-instance_attributes-ip" name="ip" value="192.168.24.6"/> <nvpair id="ip-192.168.24.6-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-192.168.24.6-meta_attributes"/> <operations> <op id="ip-192.168.24.6-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-192.168.24.6-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -213,7 +212,6 @@ <nvpair id="ip-10.0.0.102-instance_attributes-ip" name="ip" value="10.0.0.102"/> <nvpair id="ip-10.0.0.102-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-10.0.0.102-meta_attributes"/> <operations> <op id="ip-10.0.0.102-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-10.0.0.102-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -225,7 +223,6 @@ <nvpair id="ip-172.17.1.14-instance_attributes-ip" name="ip" value="172.17.1.14"/> <nvpair id="ip-172.17.1.14-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.14-meta_attributes"/> <operations> <op id="ip-172.17.1.14-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.14-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -237,7 +234,6 @@ <nvpair id="ip-172.17.1.17-instance_attributes-ip" name="ip" value="172.17.1.17"/> <nvpair id="ip-172.17.1.17-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.17-meta_attributes"/> <operations> <op id="ip-172.17.1.17-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.17-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -249,7 +245,6 @@ <nvpair id="ip-172.17.3.15-instance_attributes-ip" name="ip" value="172.17.3.15"/> <nvpair id="ip-172.17.3.15-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.3.15-meta_attributes"/> <operations> <op id="ip-172.17.3.15-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.3.15-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -261,7 +256,6 @@ <nvpair id="ip-172.17.4.11-instance_attributes-ip" name="ip" value="172.17.4.11"/> <nvpair id="ip-172.17.4.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.4.11-meta_attributes"/> <operations> <op id="ip-172.17.4.11-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.4.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -270,7 +264,6 @@ </primitive> <clone id="haproxy-clone"> <primitive class="systemd" id="haproxy" type="haproxy"> - <meta_attributes id="haproxy-meta_attributes"/> <operations> <op id="haproxy-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="haproxy-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -280,7 +273,6 @@ <meta_attributes id="haproxy-clone-meta_attributes"/> </clone> <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume"> - <meta_attributes id="openstack-cinder-volume-meta_attributes"/> <operations> <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -301,7 +293,6 @@ <operations> <op id="stonith-fence_ipmilan-525400bbf613-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400bbf613-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-525400b4f6bd" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-525400b4f6bd-instance_attributes"> @@ -317,7 +308,6 @@ <operations> <op id="stonith-fence_ipmilan-525400b4f6bd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400b4f6bd-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-5254005bdbb5" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-5254005bdbb5-instance_attributes"> @@ -333,7 +323,6 @@ <operations> <op id="stonith-fence_ipmilan-5254005bdbb5-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-5254005bdbb5-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-recover-unknown.xml b/cts/pengine/remote-recover-unknown.xml index 226f844e3..f070f1177 100644 --- a/cts/pengine/remote-recover-unknown.xml +++ b/cts/pengine/remote-recover-unknown.xml @@ -201,7 +201,6 @@ <nvpair id="ip-192.168.24.6-instance_attributes-ip" name="ip" value="192.168.24.6"/> <nvpair id="ip-192.168.24.6-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-192.168.24.6-meta_attributes"/> <operations> <op id="ip-192.168.24.6-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-192.168.24.6-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -213,7 +212,6 @@ <nvpair id="ip-10.0.0.102-instance_attributes-ip" name="ip" value="10.0.0.102"/> <nvpair id="ip-10.0.0.102-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-10.0.0.102-meta_attributes"/> <operations> <op id="ip-10.0.0.102-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-10.0.0.102-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -225,7 +223,6 @@ <nvpair id="ip-172.17.1.14-instance_attributes-ip" name="ip" value="172.17.1.14"/> <nvpair id="ip-172.17.1.14-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.14-meta_attributes"/> <operations> <op id="ip-172.17.1.14-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.14-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -237,7 +234,6 @@ <nvpair id="ip-172.17.1.17-instance_attributes-ip" name="ip" value="172.17.1.17"/> <nvpair id="ip-172.17.1.17-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.17-meta_attributes"/> <operations> <op id="ip-172.17.1.17-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.17-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -249,7 +245,6 @@ <nvpair id="ip-172.17.3.15-instance_attributes-ip" name="ip" value="172.17.3.15"/> <nvpair id="ip-172.17.3.15-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.3.15-meta_attributes"/> <operations> <op id="ip-172.17.3.15-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.3.15-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -261,7 +256,6 @@ <nvpair id="ip-172.17.4.11-instance_attributes-ip" name="ip" value="172.17.4.11"/> <nvpair id="ip-172.17.4.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.4.11-meta_attributes"/> <operations> <op id="ip-172.17.4.11-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.4.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -270,7 +264,6 @@ </primitive> <clone id="haproxy-clone"> <primitive class="systemd" id="haproxy" type="haproxy"> - <meta_attributes id="haproxy-meta_attributes"/> <operations> <op id="haproxy-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="haproxy-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -280,7 +273,6 @@ <meta_attributes id="haproxy-clone-meta_attributes"/> </clone> <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume"> - <meta_attributes id="openstack-cinder-volume-meta_attributes"/> <operations> <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -301,7 +293,6 @@ <operations> <op id="stonith-fence_ipmilan-525400bbf613-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400bbf613-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-525400b4f6bd" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-525400b4f6bd-instance_attributes"> @@ -317,7 +308,6 @@ <operations> <op id="stonith-fence_ipmilan-525400b4f6bd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400b4f6bd-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-5254005bdbb5" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-5254005bdbb5-instance_attributes"> @@ -333,7 +323,6 @@ <operations> <op id="stonith-fence_ipmilan-5254005bdbb5-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-5254005bdbb5-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-recovery.xml b/cts/pengine/remote-recovery.xml index 845b23958..90249158f 100644 --- a/cts/pengine/remote-recovery.xml +++ b/cts/pengine/remote-recovery.xml @@ -201,7 +201,6 @@ <nvpair id="ip-192.168.24.6-instance_attributes-ip" name="ip" value="192.168.24.6"/> <nvpair id="ip-192.168.24.6-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-192.168.24.6-meta_attributes"/> <operations> <op id="ip-192.168.24.6-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-192.168.24.6-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -213,7 +212,6 @@ <nvpair id="ip-10.0.0.102-instance_attributes-ip" name="ip" value="10.0.0.102"/> <nvpair id="ip-10.0.0.102-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-10.0.0.102-meta_attributes"/> <operations> <op id="ip-10.0.0.102-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-10.0.0.102-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -225,7 +223,6 @@ <nvpair id="ip-172.17.1.14-instance_attributes-ip" name="ip" value="172.17.1.14"/> <nvpair id="ip-172.17.1.14-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.14-meta_attributes"/> <operations> <op id="ip-172.17.1.14-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.14-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -237,7 +234,6 @@ <nvpair id="ip-172.17.1.17-instance_attributes-ip" name="ip" value="172.17.1.17"/> <nvpair id="ip-172.17.1.17-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.1.17-meta_attributes"/> <operations> <op id="ip-172.17.1.17-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.1.17-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -249,7 +245,6 @@ <nvpair id="ip-172.17.3.15-instance_attributes-ip" name="ip" value="172.17.3.15"/> <nvpair id="ip-172.17.3.15-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.3.15-meta_attributes"/> <operations> <op id="ip-172.17.3.15-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.3.15-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -261,7 +256,6 @@ <nvpair id="ip-172.17.4.11-instance_attributes-ip" name="ip" value="172.17.4.11"/> <nvpair id="ip-172.17.4.11-instance_attributes-cidr_netmask" name="cidr_netmask" value="32"/> </instance_attributes> - <meta_attributes id="ip-172.17.4.11-meta_attributes"/> <operations> <op id="ip-172.17.4.11-start-interval-0s" interval="0s" name="start" timeout="20s"/> <op id="ip-172.17.4.11-stop-interval-0s" interval="0s" name="stop" timeout="20s"/> @@ -270,7 +264,6 @@ </primitive> <clone id="haproxy-clone"> <primitive class="systemd" id="haproxy" type="haproxy"> - <meta_attributes id="haproxy-meta_attributes"/> <operations> <op id="haproxy-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="haproxy-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -280,7 +273,6 @@ <meta_attributes id="haproxy-clone-meta_attributes"/> </clone> <primitive class="systemd" id="openstack-cinder-volume" type="openstack-cinder-volume"> - <meta_attributes id="openstack-cinder-volume-meta_attributes"/> <operations> <op id="openstack-cinder-volume-start-interval-0s" interval="0s" name="start" timeout="200s"/> <op id="openstack-cinder-volume-stop-interval-0s" interval="0s" name="stop" timeout="200s"/> @@ -301,7 +293,6 @@ <operations> <op id="stonith-fence_ipmilan-525400bbf613-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400bbf613-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-525400b4f6bd" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-525400b4f6bd-instance_attributes"> @@ -317,7 +308,6 @@ <operations> <op id="stonith-fence_ipmilan-525400b4f6bd-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-525400b4f6bd-meta_attributes"/> </primitive> <primitive class="stonith" id="stonith-fence_ipmilan-5254005bdbb5" type="fence_ipmilan"> <instance_attributes id="stonith-fence_ipmilan-5254005bdbb5-instance_attributes"> @@ -333,7 +323,6 @@ <operations> <op id="stonith-fence_ipmilan-5254005bdbb5-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="stonith-fence_ipmilan-5254005bdbb5-meta_attributes"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/remote-start-fail.xml b/cts/pengine/remote-start-fail.xml index 0c54326ca..92f5fc1a1 100644 --- a/cts/pengine/remote-start-fail.xml +++ b/cts/pengine/remote-start-fail.xml @@ -25,7 +25,6 @@ <op id="rhel7-auto4-stop-timeout-60" interval="0s" name="stop" timeout="60"/> <op id="rhel7-auto4-monitor-timeout-30" interval="60s" name="monitor" timeout="30"/> </operations> - <meta_attributes id="rhel7-auto4-meta_attributes"/> </primitive> </resources> <constraints/> diff --git a/cts/pengine/remote-startup-probes.xml b/cts/pengine/remote-startup-probes.xml index 23cf5c6a7..7561f1ea3 100644 --- a/cts/pengine/remote-startup-probes.xml +++ b/cts/pengine/remote-startup-probes.xml @@ -21,7 +21,6 @@ <operations> <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="remote1-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> <operations> diff --git a/cts/pengine/resource-discovery.xml b/cts/pengine/resource-discovery.xml index 9882cc941..0b9cc3dbe 100644 --- a/cts/pengine/resource-discovery.xml +++ b/cts/pengine/resource-discovery.xml @@ -22,16 +22,13 @@ <operations> <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="remote1-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> - <meta_attributes id="FAKE1-meta_attributes"/> <operations> <op id="FAKE1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> </primitive> <primitive class="ocf" id="FAKE2" provider="heartbeat" type="Dummy"> - <meta_attributes id="FAKE2-meta_attributes"/> <operations> <op id="FAKE2-monitor-interval-60s" interval="60s" name="monitor"/> </operations> diff --git a/cts/pengine/rsc-discovery-per-node.xml b/cts/pengine/rsc-discovery-per-node.xml index f5de447c0..402c47d9c 100644 --- a/cts/pengine/rsc-discovery-per-node.xml +++ b/cts/pengine/rsc-discovery-per-node.xml @@ -27,18 +27,13 @@ <operations> <op id="remote1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="remote1-meta_attributes"/> </primitive> <primitive class="ocf" id="FAKE1" provider="heartbeat" type="Dummy"> - <meta_attributes id="FAKE1-meta_attributes"> - </meta_attributes> <operations> <op id="FAKE1-monitor-interval-60s" interval="60s" name="monitor"/> </operations> </primitive> <primitive class="ocf" id="FAKE2" provider="heartbeat" type="Dummy"> - <meta_attributes id="FAKE2-meta_attributes"> - </meta_attributes> <operations> <op id="FAKE2-monitor-interval-60s" interval="60s" name="monitor"/> </operations> diff --git a/cts/pengine/rsc-sets-clone-1.xml b/cts/pengine/rsc-sets-clone-1.xml index bf02f182f..04d0577df 100644 --- a/cts/pengine/rsc-sets-clone-1.xml +++ b/cts/pengine/rsc-sets-clone-1.xml @@ -177,7 +177,6 @@ <operations id="fs2-operations"> <op id="fs2-monitor-20" interval="20" name="monitor" timeout="40"/> </operations> - <meta_attributes id="fs2-meta_attributes"/> </primitive> </group> </clone> diff --git a/cts/pengine/rsc_dep10.xml b/cts/pengine/rsc_dep10.xml index 41ee78fa9..c618212b3 100644 --- a/cts/pengine/rsc_dep10.xml +++ b/cts/pengine/rsc_dep10.xml @@ -14,12 +14,8 @@ <node id="node2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_colocation id="same_1" rsc="rsc1" with-rsc="rsc2" score="INFINITY"/> diff --git a/cts/pengine/simple1.xml b/cts/pengine/simple1.xml index a540fc26a..7e59844bc 100644 --- a/cts/pengine/simple1.xml +++ b/cts/pengine/simple1.xml @@ -13,9 +13,7 @@ <node id="node1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/simple11.xml b/cts/pengine/simple11.xml index a7bc390a1..6e69cc10e 100644 --- a/cts/pengine/simple11.xml +++ b/cts/pengine/simple11.xml @@ -18,13 +18,11 @@ <instance_attributes id="instance_attributes.id21879"> <nvpair id="nvpair.id21886" name="priority" value="3.0"/> </instance_attributes> - <meta_attributes id="primitive-rsc1.meta"/> </primitive> <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> <instance_attributes id="instance_attributes.id21905"> <nvpair id="nvpair.id21912" name="priority" value="2.0"/> </instance_attributes> - <meta_attributes id="primitive-rsc2.meta"/> </primitive> </resources> <constraints> diff --git a/cts/pengine/simple12.xml b/cts/pengine/simple12.xml index ed65e3ec1..33fdda4a5 100644 --- a/cts/pengine/simple12.xml +++ b/cts/pengine/simple12.xml @@ -14,12 +14,8 @@ <node id="node2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints> <rsc_location id="run_rsc1" rsc="rsc1"> diff --git a/cts/pengine/simple2.xml b/cts/pengine/simple2.xml index 5ff740481..01fe749f3 100644 --- a/cts/pengine/simple2.xml +++ b/cts/pengine/simple2.xml @@ -13,9 +13,7 @@ <node id="uuid2" uname="node2" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/simple3.xml b/cts/pengine/simple3.xml index c66252ec7..20b2cea9e 100644 --- a/cts/pengine/simple3.xml +++ b/cts/pengine/simple3.xml @@ -12,9 +12,7 @@ <node id="node1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/simple7.xml b/cts/pengine/simple7.xml index e3c044acd..eaa085987 100644 --- a/cts/pengine/simple7.xml +++ b/cts/pengine/simple7.xml @@ -13,9 +13,7 @@ <node id="node1" uname="node1" type="member"/> </nodes> <resources> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> </resources> <constraints/> </configuration> diff --git a/cts/pengine/simple8.xml b/cts/pengine/simple8.xml index 1d95761d1..fffd759fd 100644 --- a/cts/pengine/simple8.xml +++ b/cts/pengine/simple8.xml @@ -19,22 +19,14 @@ </meta_attributes> </rsc_defaults> <resources> - <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc3.meta"/> - </primitive> - <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc4.meta"/> - </primitive> + <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/> + <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/> <group id="foo"> - <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc1.meta"/> - </primitive> + <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-foo.meta"/> </group> <group id="bar"> - <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"> - <meta_attributes id="primitive-rsc2.meta"/> - </primitive> + <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/> <meta_attributes id="group-bar.meta"/> </group> </resources> diff --git a/cts/pengine/standby.xml b/cts/pengine/standby.xml index e0ba91c39..f73e8b352 100644 --- a/cts/pengine/standby.xml +++ b/cts/pengine/standby.xml @@ -35,7 +35,6 @@ <instance_attributes id="instance_attributes.id22062"> <nvpair id="nvpair.id22069" name="ip" value="192.168.1.101"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_101.meta"/> </primitive> <primitive id="LVM_2" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -44,7 +43,6 @@ <instance_attributes id="instance_attributes.id22105"> <nvpair id="nvpair.id22111" name="volgrpname" value="data01vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_2.meta"/> </primitive> <primitive id="Filesystem_3" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -55,7 +53,6 @@ <nvpair id="nvpair.id22163" name="directory" value="/data/d1"/> <nvpair id="nvpair.id22172" name="fstype" value="xfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_3.meta"/> </primitive> <meta_attributes id="group-app01.meta"/> </group> @@ -67,7 +64,6 @@ <instance_attributes id="instance_attributes.id22213"> <nvpair id="nvpair.id22220" name="ip" value="192.168.1.102"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_102.meta"/> </primitive> <primitive id="LVM_12" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -76,7 +72,6 @@ <instance_attributes id="instance_attributes.id22255"> <nvpair id="nvpair.id22262" name="volgrpname" value="data02vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_12.meta"/> </primitive> <primitive id="Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -87,7 +82,6 @@ <nvpair id="nvpair.id22314" name="directory" value="/data/d2"/> <nvpair id="nvpair.id22322" name="fstype" value="ext3"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_13.meta"/> </primitive> <meta_attributes id="group-app02.meta"/> </group> @@ -99,7 +93,6 @@ <instance_attributes id="instance_attributes.id22364"> <nvpair id="nvpair.id22371" name="ip" value="192.168.1.104"/> </instance_attributes> - <meta_attributes id="primitive-IPaddr_192_168_1_104.meta"/> </primitive> <primitive id="LVM_22" class="ocf" provider="heartbeat" type="LVM"> <operations> @@ -108,7 +101,6 @@ <instance_attributes id="instance_attributes.id22406"> <nvpair id="nvpair.id22413" name="volgrpname" value="data03vg"/> </instance_attributes> - <meta_attributes id="primitive-LVM_22.meta"/> </primitive> <primitive id="Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"> <operations> @@ -119,7 +111,6 @@ <nvpair id="nvpair.id22465" name="directory" value="/data/d3"/> <nvpair id="nvpair.id22473" name="fstype" value="xfs"/> </instance_attributes> - <meta_attributes id="primitive-Filesystem_23.meta"/> </primitive> <primitive id="oracle_24" class="ocf" provider="heartbeat" type="oracle"> <operations> @@ -128,7 +119,6 @@ <instance_attributes id="instance_attributes.id22509"> <nvpair id="nvpair.id22516" name="sid" value="testdb"/> </instance_attributes> - <meta_attributes id="primitive-oracle_24.meta"/> </primitive> <primitive id="oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"> <operations> @@ -137,7 +127,6 @@ <instance_attributes id="instance_attributes.id22552"> <nvpair id="nvpair.id22558" name="sid" value="testdb"/> </instance_attributes> - <meta_attributes id="primitive-oralsnr_25.meta"/> </primitive> <meta_attributes id="group-oracle.meta"/> </group> diff --git a/cts/pengine/start-then-stop-with-unfence.xml b/cts/pengine/start-then-stop-with-unfence.xml index 42d0684ee..9e42e3a8e 100644 --- a/cts/pengine/start-then-stop-with-unfence.xml +++ b/cts/pengine/start-then-stop-with-unfence.xml @@ -75,7 +75,6 @@ <op id="jrummy-promote-interval-0s" interval="0s" name="promote" timeout="120"/> <op id="jrummy-demote-interval-0s" interval="0s" name="demote" timeout="120"/> </operations> - <meta_attributes id="jrummy-meta_attributes"/> </primitive> <meta_attributes id="jrummy-clone-meta_attributes"/> </clone> diff --git a/cts/pengine/stonith-0.xml b/cts/pengine/stonith-0.xml index f31719a83..3a5d7a33a 100644 --- a/cts/pengine/stonith-0.xml +++ b/cts/pengine/stonith-0.xml @@ -52,7 +52,6 @@ <instance_attributes id="instance_attributes.id22152"> <nvpair id="nvpair.id22159" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.181.meta"/> </primitive> <primitive id="heartbeat_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -61,7 +60,6 @@ <instance_attributes id="instance_attributes.id22196"> <nvpair id="nvpair.id22202" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-heartbeat_192.168.100.182.meta"/> </primitive> <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -70,7 +68,6 @@ <instance_attributes id="instance_attributes.id22238"> <nvpair id="nvpair.id22244" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-ocf_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -78,7 +75,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor" timeout="20s"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -194,7 +190,6 @@ <instance_attributes id="instance_attributes.id22831"> <nvpair id="nvpair.id22838" name="logfile" value="/var/log/cts_ocfdummy.log"/> </instance_attributes> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-324" name="promotable" value="true"/> diff --git a/cts/pengine/stonith-1.xml b/cts/pengine/stonith-1.xml index 6f97d2a4c..ef0c02075 100644 --- a/cts/pengine/stonith-1.xml +++ b/cts/pengine/stonith-1.xml @@ -45,7 +45,6 @@ <instance_attributes id="instance_attributes.id22116"> <nvpair id="nvpair.id22123" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.181.meta"/> </primitive> <primitive id="r192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -54,7 +53,6 @@ <instance_attributes id="instance_attributes.id22155"> <nvpair id="nvpair.id22162" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.182.meta"/> </primitive> <primitive id="r192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -63,7 +61,6 @@ <instance_attributes id="instance_attributes.id22196"> <nvpair id="nvpair.id22202" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -71,7 +68,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="migrator" class="ocf" type="Dummy" provider="heartbeat"> <operations> @@ -91,7 +87,6 @@ <instance_attributes id="instance_attributes.id22301"> <nvpair id="nvpair.id22307" name="ip" value="192.168.100.184"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-1.meta"/> </primitive> <primitive id="rsc_sles-2" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -100,7 +95,6 @@ <instance_attributes id="instance_attributes.id22340"> <nvpair id="nvpair.id22347" name="ip" value="192.168.100.185"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-2.meta"/> </primitive> <primitive id="rsc_sles-3" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -109,7 +103,6 @@ <instance_attributes id="instance_attributes.id22380"> <nvpair id="nvpair.id22386" name="ip" value="192.168.100.186"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-3.meta"/> </primitive> <primitive id="rsc_sles-4" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -118,7 +111,6 @@ <instance_attributes id="instance_attributes.id22420"> <nvpair id="nvpair.id22426" name="ip" value="192.168.100.187"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-4.meta"/> </primitive> <clone id="DoFencing"> <primitive id="child_DoFencing" class="stonith" type="external/vmware"> @@ -146,7 +138,6 @@ <op name="monitor" interval="5s" id="ocf_msdummy_monitor"/> <op name="monitor" interval="6s" id="ocf_msdummy_monitor_master" role="Master"/> </operations> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-254" name="promotable" value="true"/> diff --git a/cts/pengine/stonith-2.xml b/cts/pengine/stonith-2.xml index a59bcefb4..5ff23c662 100644 --- a/cts/pengine/stonith-2.xml +++ b/cts/pengine/stonith-2.xml @@ -51,7 +51,6 @@ <instance_attributes id="instance_attributes.id22105"> <nvpair id="nvpair.id22112" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.181.meta"/> </primitive> <primitive id="r192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"> <operations> @@ -60,7 +59,6 @@ <instance_attributes id="instance_attributes.id22144"> <nvpair id="nvpair.id22151" name="1" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.182.meta"/> </primitive> <primitive id="r192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -69,7 +67,6 @@ <instance_attributes id="instance_attributes.id22185"> <nvpair id="nvpair.id22192" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-r192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> @@ -77,7 +74,6 @@ <operations> <op name="monitor" interval="5s" id="ocf_lsb_monitor"/> </operations> - <meta_attributes id="primitive-lsb_dummy.meta"/> </primitive> <primitive id="migrator" class="ocf" type="Dummy" provider="heartbeat"> <operations> @@ -97,7 +93,6 @@ <instance_attributes id="instance_attributes.id22290"> <nvpair id="nvpair.id22296" name="ip" value="192.168.100.184"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-1.meta"/> </primitive> <primitive id="rsc_sles-2" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -106,7 +101,6 @@ <instance_attributes id="instance_attributes.id22329"> <nvpair id="nvpair.id22336" name="ip" value="192.168.100.185"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-2.meta"/> </primitive> <primitive id="rsc_sles-3" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -115,7 +109,6 @@ <instance_attributes id="instance_attributes.id22369"> <nvpair id="nvpair.id22376" name="ip" value="192.168.100.186"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-3.meta"/> </primitive> <primitive id="rsc_sles-4" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -124,7 +117,6 @@ <instance_attributes id="instance_attributes.id22409"> <nvpair id="nvpair.id22415" name="ip" value="192.168.100.187"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-4.meta"/> </primitive> <primitive id="rsc_sles-5" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -133,7 +125,6 @@ <instance_attributes id="instance_attributes.id22449"> <nvpair id="nvpair.id22455" name="ip" value="192.168.100.188"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-5.meta"/> </primitive> <primitive id="rsc_sles-6" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -142,7 +133,6 @@ <instance_attributes id="instance_attributes.id22488"> <nvpair id="nvpair.id22495" name="ip" value="192.168.100.189"/> </instance_attributes> - <meta_attributes id="primitive-rsc_sles-6.meta"/> </primitive> <clone id="DoFencing"> <primitive id="child_DoFencing" class="stonith" type="external/vmware"> @@ -169,7 +159,6 @@ <op name="monitor" interval="5s" id="ocf_msdummy_monitor"/> <op name="monitor" interval="6s" id="ocf_msdummy_monitor_master" role="Master"/> </operations> - <meta_attributes id="primitive-ocf_msdummy.meta"/> </primitive> <meta_attributes id="clone-master_rsc_1.meta"> <nvpair id="nvpair.meta.auto-304" name="promotable" value="true"/> diff --git a/cts/pengine/suicide-needed-inquorate.xml b/cts/pengine/suicide-needed-inquorate.xml index 54e8b4168..e626ea662 100644 --- a/cts/pengine/suicide-needed-inquorate.xml +++ b/cts/pengine/suicide-needed-inquorate.xml @@ -15,8 +15,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3"/> diff --git a/cts/pengine/suicide-not-needed-initial-quorum.xml b/cts/pengine/suicide-not-needed-initial-quorum.xml index 473c37edd..ba951bd01 100644 --- a/cts/pengine/suicide-not-needed-initial-quorum.xml +++ b/cts/pengine/suicide-not-needed-initial-quorum.xml @@ -15,8 +15,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3"/> diff --git a/cts/pengine/suicide-not-needed-never-quorate.xml b/cts/pengine/suicide-not-needed-never-quorate.xml index 61ce163b2..b16820e4a 100644 --- a/cts/pengine/suicide-not-needed-never-quorate.xml +++ b/cts/pengine/suicide-not-needed-never-quorate.xml @@ -15,8 +15,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3"/> diff --git a/cts/pengine/suicide-not-needed-quorate.xml b/cts/pengine/suicide-not-needed-quorate.xml index f57014f68..0fc610721 100644 --- a/cts/pengine/suicide-not-needed-quorate.xml +++ b/cts/pengine/suicide-not-needed-quorate.xml @@ -15,8 +15,6 @@ </nodes> <resources> <primitive id="Fencing" class="stonith" type="fence_xvm"> - <meta_attributes id="Fencing-meta"> - </meta_attributes> <instance_attributes id="Fencing-params"> <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/> <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="node1 node2 node3"/> diff --git a/cts/pengine/unmanaged-block-restart.xml b/cts/pengine/unmanaged-block-restart.xml index 53dd42070..ea103af99 100644 --- a/cts/pengine/unmanaged-block-restart.xml +++ b/cts/pengine/unmanaged-block-restart.xml @@ -22,7 +22,6 @@ </operations> </primitive> <primitive id="rsc3" class="ocf" provider="pacemaker" type="Dummy"> - <meta_attributes id="rsc3-meta_attributes"/> <operations> <op id="rsc3-monitor-10" interval="10" name="monitor"/> </operations> diff --git a/cts/pengine/unrunnable-1.xml b/cts/pengine/unrunnable-1.xml index a7ccdc105..62f06645f 100644 --- a/cts/pengine/unrunnable-1.xml +++ b/cts/pengine/unrunnable-1.xml @@ -35,7 +35,6 @@ <instance_attributes id="instance_attributes.id22004"> <nvpair id="nvpair.id22011" name="ip" value="192.168.100.181"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.181.meta"/> </primitive> <primitive id="child_192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -44,7 +43,6 @@ <instance_attributes id="instance_attributes.id22047"> <nvpair id="nvpair.id22053" name="ip" value="192.168.100.182"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.182.meta"/> </primitive> <primitive id="child_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"> <operations> @@ -53,7 +51,6 @@ <instance_attributes id="instance_attributes.id22089"> <nvpair id="nvpair.id22095" name="ip" value="192.168.100.183"/> </instance_attributes> - <meta_attributes id="primitive-child_192.168.100.183.meta"/> </primitive> <meta_attributes id="group-group-1.meta"/> </group> diff --git a/cts/pengine/versioned-resources.xml b/cts/pengine/versioned-resources.xml index 9556dc9b1..9f63af848 100644 --- a/cts/pengine/versioned-resources.xml +++ b/cts/pengine/versioned-resources.xml @@ -93,7 +93,6 @@ <op id="vtest4-stop-interval-0s" interval="0s" name="stop" timeout="20"/> <op id="vtest4-monitor-interval-10" interval="10" name="monitor" timeout="20"/> </operations> - <meta_attributes id="vtest4-meta_attributes"/> </primitive> <clone id="vtest5-clone"> <meta_attributes id="vtest5-clone-meta"/> @@ -111,7 +110,6 @@ <operations> <op id="vtest5-monitor-interval-10" interval="10" name="monitor" timeout="20"/> </operations> - <meta_attributes id="vtest5-meta_attributes"/> </primitive> </clone> <clone id="vtest7-master"> diff --git a/cts/pengine/whitebox-ms-ordering-move.xml b/cts/pengine/whitebox-ms-ordering-move.xml index 7306a41a1..7bb120a0b 100644 --- a/cts/pengine/whitebox-ms-ordering-move.xml +++ b/cts/pengine/whitebox-ms-ordering-move.xml @@ -118,7 +118,6 @@ <operations> <op id="migrator-monitor-P10S" interval="P10S" name="monitor"/> </operations> - <meta_attributes id="migrator-meta_attributes"/> </primitive> <clone id="Connectivity"> <meta_attributes id="Connectivity-meta"> @@ -133,7 +132,6 @@ <operations> <op id="ping-1-monitor-60s" interval="60s" name="monitor"/> </operations> - <meta_attributes id="ping-1-meta_attributes"/> </primitive> <meta_attributes id="Connectivity-meta_attributes"/> </clone>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
