1d92dc70ad
- stonith-ng: export stonith resource name to stonith agents - crmd: Send out all of the meta parameters to lrmd for stop action - RA: Fix the metadata of HealthSMART and SysInfo RAs - stonith: Longer default timeout/interval of operations for stonith resources - Doc: many proof-reading improvements - stonith: Fix the stonith timeout issue (cl#5009, bnc#727498) - update the license information in pacemaker.spec (bnc#726795) - xml: Add rsc_ticket support into "pacemaker-1.2" schema - xml: Add resource template support into "pacemaker-1.2" schema - tools: Avoid problems caused by differences between node name and uname -n - PE: Resolve memory leak when retrieving failure counts - Stonith: Implement a manual override for when nodes are known to be safely off - PE: Implement limit number of concurrent live migrations (FATE#310118) - PE: Implement referencing templates in constraints - PE: Move master based on failure of colocated group - Fencing: Support admin configurable timeouts for API operations - Fencing: Support checking in-progress operations for all nodes - don't package crm shell code - add Requires: crmsh - Build man pages and html versions (bnc#723680) - Shell: template support - Upstream version cs: b988976485d15cb702c9307df55512d323831a5e OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=24
64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
commit 288cbadc532f1256129d1fcef5716ac1eb7d4bde
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
Date: Wed Oct 26 17:45:03 2011 +0800
|
|
|
|
Medium: xml: Add resource template support into "pacemaker-1.2" schema
|
|
|
|
diff --git a/xml/resources-1.2.rng b/xml/resources-1.2.rng
|
|
index d2fe1a8..d295b2a 100644
|
|
--- a/xml/resources-1.2.rng
|
|
+++ b/xml/resources-1.2.rng
|
|
@@ -9,6 +9,7 @@
|
|
<zeroOrMore>
|
|
<choice>
|
|
<ref name="element-primitive"/>
|
|
+ <ref name="element-template"/>
|
|
<ref name="element-group"/>
|
|
<ref name="element-clone"/>
|
|
<ref name="element-master"/>
|
|
@@ -22,6 +23,44 @@
|
|
<attribute name="id"><data type="ID"/></attribute>
|
|
<choice>
|
|
<group>
|
|
+ <choice>
|
|
+ <group>
|
|
+ <attribute name="class"><value>ocf</value></attribute>
|
|
+ <attribute name="provider"><text/></attribute>
|
|
+ </group>
|
|
+ <attribute name="class">
|
|
+ <choice>
|
|
+ <value>lsb</value>
|
|
+ <value>heartbeat</value>
|
|
+ <value>stonith</value>
|
|
+ <value>upstart</value>
|
|
+ </choice>
|
|
+ </attribute>
|
|
+ </choice>
|
|
+ <attribute name="type"><text/></attribute>
|
|
+ </group>
|
|
+ <attribute name="template"><data type="IDREF"/></attribute>
|
|
+ </choice>
|
|
+ <optional>
|
|
+ <attribute name="description"><text/></attribute>
|
|
+ </optional>
|
|
+ <ref name="element-resource-extra"/>
|
|
+ <ref name="element-operations"/>
|
|
+ <zeroOrMore>
|
|
+ <element name="utilization">
|
|
+ <externalRef href="nvset.rng"/>
|
|
+ </element>
|
|
+ </zeroOrMore>
|
|
+ </interleave>
|
|
+ </element>
|
|
+ </define>
|
|
+
|
|
+ <define name="element-template">
|
|
+ <element name="template">
|
|
+ <interleave>
|
|
+ <attribute name="id"><data type="ID"/></attribute>
|
|
+ <choice>
|
|
+ <group>
|
|
<attribute name="class"><value>ocf</value></attribute>
|
|
<attribute name="provider"><text/></attribute>
|
|
</group>
|