diff --git a/xml/api/crm_mon-2.28.rng b/xml/api/crm_mon-2.28.rng
index eeffaf2185..490f218630 100644
--- a/xml/api/crm_mon-2.28.rng
+++ b/xml/api/crm_mon-2.28.rng
@@ -1,189 +1,189 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start>
<ref name="element-crm-mon"/>
</start>
<define name="element-crm-mon">
<optional>
<ref name="element-summary" />
</optional>
<optional>
<ref name="nodes-list" />
</optional>
<optional>
<ref name="resources-list" />
</optional>
<optional>
<ref name="node-attributes-list" />
</optional>
<optional>
<externalRef href="node-history-2.12.rng"/>
</optional>
<optional>
<ref name="failures-list" />
</optional>
<optional>
<ref name="fence-event-list" />
</optional>
<optional>
<ref name="tickets-list" />
</optional>
<optional>
<ref name="bans-list" />
</optional>
</define>
<define name="element-summary">
<element name="summary">
<optional>
<element name="stack">
<attribute name="type"> <text /> </attribute>
</element>
</optional>
<optional>
<element name="current_dc">
<attribute name="present"> <data type="boolean" /> </attribute>
<optional>
<group>
<attribute name="version"> <text /> </attribute>
<attribute name="name"> <text /> </attribute>
<attribute name="id"> <text /> </attribute>
<attribute name="with_quorum"> <data type="boolean" /> </attribute>
</group>
</optional>
<optional>
<attribute name="mixed_version"> <data type="boolean" /> </attribute>
</optional>
</element>
</optional>
<optional>
<element name="last_update">
<attribute name="time"> <text /> </attribute>
<optional>
<attribute name="origin"> <text /> </attribute>
</optional>
</element>
<element name="last_change">
<attribute name="time"> <text /> </attribute>
<attribute name="user"> <text /> </attribute>
<attribute name="client"> <text /> </attribute>
<attribute name="origin"> <text /> </attribute>
</element>
</optional>
<optional>
<element name="nodes_configured">
<attribute name="number"> <data type="nonNegativeInteger" /> </attribute>
</element>
<element name="resources_configured">
<attribute name="number"> <data type="nonNegativeInteger" /> </attribute>
<attribute name="disabled"> <data type="nonNegativeInteger" /> </attribute>
<attribute name="blocked"> <data type="nonNegativeInteger" /> </attribute>
</element>
</optional>
<optional>
<element name="cluster_options">
<attribute name="stonith-enabled"> <data type="boolean" /> </attribute>
<attribute name="symmetric-cluster"> <data type="boolean" /> </attribute>
<attribute name="no-quorum-policy"> <text /> </attribute>
<attribute name="maintenance-mode"> <data type="boolean" /> </attribute>
<attribute name="stop-all-resources"> <data type="boolean" /> </attribute>
<attribute name="stonith-timeout-ms"> <data type="integer" /> </attribute>
<attribute name="priority-fencing-delay-ms"> <data type="integer" /> </attribute>
</element>
</optional>
</element>
</define>
<define name="resources-list">
<element name="resources">
<zeroOrMore>
- <externalRef href="resources-2.29.rng" />
+ <externalRef href="resources-2.28.rng" />
</zeroOrMore>
</element>
</define>
<define name="nodes-list">
<element name="nodes">
<zeroOrMore>
- <externalRef href="nodes-2.29.rng" />
+ <externalRef href="nodes-2.28.rng" />
</zeroOrMore>
</element>
</define>
<define name="node-attributes-list">
<element name="node_attributes">
<zeroOrMore>
<externalRef href="node-attrs-2.8.rng" />
</zeroOrMore>
</element>
</define>
<define name="failures-list">
<element name="failures">
<zeroOrMore>
<externalRef href="failure-2.8.rng" />
</zeroOrMore>
</element>
</define>
<define name="fence-event-list">
<element name="fence_history">
<optional>
<attribute name="status"> <data type="integer" /> </attribute>
</optional>
<zeroOrMore>
- <externalRef href="fence-event-2.28.rng" />
+ <externalRef href="fence-event-2.15.rng" />
</zeroOrMore>
</element>
</define>
<define name="tickets-list">
<element name="tickets">
<zeroOrMore>
<ref name="element-ticket" />
</zeroOrMore>
</element>
</define>
<define name="bans-list">
<element name="bans">
<zeroOrMore>
<ref name="element-ban" />
</zeroOrMore>
</element>
</define>
<define name="element-ticket">
<element name="ticket">
<attribute name="id"> <text /> </attribute>
<attribute name="status">
<choice>
<value>granted</value>
<value>revoked</value>
</choice>
</attribute>
<attribute name="standby"> <data type="boolean" /> </attribute>
<optional>
<attribute name="last-granted"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-ban">
<element name="ban">
<attribute name="id"> <text /> </attribute>
<attribute name="resource"> <text /> </attribute>
<attribute name="node"> <text /> </attribute>
<attribute name="weight"> <data type="integer" /> </attribute>
<attribute name="promoted-only"> <data type="boolean" /> </attribute>
<!-- DEPRECATED: master_only is a duplicate of promoted-only that is
provided solely for API backward compatibility. It will be
removed in a future release. Check promoted-only instead.
-->
<attribute name="master_only"> <data type="boolean" /> </attribute>
</element>
</define>
</grammar>
diff --git a/xml/api/crm_resource-2.28.rng b/xml/api/crm_resource-2.28.rng
index d95fd56a87..901b81d74d 100644
--- a/xml/api/crm_resource-2.28.rng
+++ b/xml/api/crm_resource-2.28.rng
@@ -1,288 +1,288 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start>
<ref name="element-crm-resource"/>
</start>
<define name="element-crm-resource">
<choice>
<ref name="agents-list" />
<ref name="alternatives-list" />
<ref name="constraints-list" />
<externalRef href="generic-list-2.4.rng"/>
<element name="metadata"> <text/> </element>
<ref name="locate-list" />
<ref name="operations-list" />
<ref name="providers-list" />
<ref name="reasons-list" />
<ref name="resource-check" />
<ref name="resource-config" />
<ref name="resources-list" />
<ref name="resource-agent-action" />
</choice>
</define>
<define name="agents-list">
<element name="agents">
<attribute name="standard"> <text/> </attribute>
<optional>
<attribute name="provider"> <text/> </attribute>
</optional>
<zeroOrMore>
<element name="agent"> <text/> </element>
</zeroOrMore>
</element>
</define>
<define name="alternatives-list">
<element name="providers">
<attribute name="for"> <text/> </attribute>
<zeroOrMore>
<element name="provider"> <text/> </element>
</zeroOrMore>
</element>
</define>
<define name="constraints-list">
<element name="constraints">
<interleave>
<zeroOrMore>
<ref name="rsc-location" />
</zeroOrMore>
<zeroOrMore>
<ref name="rsc-colocation" />
</zeroOrMore>
</interleave>
</element>
</define>
<define name="locate-list">
<element name="nodes">
<attribute name="resource"> <text/> </attribute>
<zeroOrMore>
<element name="node">
<optional>
<attribute name="state"><value>promoted</value></attribute>
</optional>
<text/>
</element>
</zeroOrMore>
</element>
</define>
<define name="rsc-location">
<element name="rsc_location">
<attribute name="node"> <text/> </attribute>
<attribute name="rsc"> <text/> </attribute>
<attribute name="id"> <text/> </attribute>
<externalRef href="../score.rng"/>
</element>
</define>
<define name="operations-list">
<element name="operations">
<oneOrMore>
<ref name="element-operation-list" />
</oneOrMore>
</element>
</define>
<define name="providers-list">
<element name="providers">
<attribute name="standard"> <value>ocf</value> </attribute>
<optional>
<attribute name="agent"> <text/> </attribute>
</optional>
<zeroOrMore>
<element name="provider"> <text/> </element>
</zeroOrMore>
</element>
</define>
<define name="reasons-list">
<element name="reason">
<!-- set only when resource and node are both specified -->
<optional>
<attribute name="running_on"> <text/> </attribute>
</optional>
<!-- set only when only a resource is specified -->
<optional>
<attribute name="running"> <data type="boolean"/> </attribute>
</optional>
<choice>
<ref name="reasons-with-no-resource"/>
<ref name="resource-check"/>
</choice>
</element>
</define>
<define name="reasons-with-no-resource">
<element name="resources">
<zeroOrMore>
<element name="resource">
<attribute name="id"> <text/> </attribute>
<attribute name="running"> <data type="boolean"/> </attribute>
<optional>
<attribute name="host"> <text/> </attribute>
</optional>
<ref name="resource-check"/>
</element>
</zeroOrMore>
</element>
</define>
<define name="resource-config">
<element name="resource_config">
- <externalRef href="resources-2.29.rng" />
+ <externalRef href="resources-2.28.rng" />
<element name="xml"> <text/> </element>
</element>
</define>
<define name="resource-check">
<element name="check">
<attribute name="id"> <text/> </attribute>
<optional>
<choice>
<attribute name="remain_stopped"><value>true</value></attribute>
<attribute name="promotable"><value>false</value></attribute>
</choice>
</optional>
<optional>
<attribute name="unmanaged"><value>true</value></attribute>
</optional>
<optional>
<attribute name="locked-to"> <text/> </attribute>
</optional>
<optional>
<attribute name="unhealthy"><value>true</value></attribute>
</optional>
</element>
</define>
<define name="resources-list">
<element name="resources">
<zeroOrMore>
- <externalRef href="resources-2.29.rng" />
+ <externalRef href="resources-2.28.rng" />
</zeroOrMore>
</element>
</define>
<define name="rsc-colocation">
<element name="rsc_colocation">
<attribute name="id"> <text/> </attribute>
<attribute name="rsc"> <text/> </attribute>
<attribute name="with-rsc"> <text/> </attribute>
<externalRef href="../score.rng"/>
<optional>
<attribute name="node-attribute"> <text/> </attribute>
</optional>
<optional>
<attribute name="rsc-role">
<ref name="attribute-roles"/>
</attribute>
</optional>
<optional>
<attribute name="with-rsc-role">
<ref name="attribute-roles"/>
</attribute>
</optional>
</element>
</define>
<define name="element-operation-list">
<element name="operation">
<optional>
<group>
<attribute name="rsc"> <text/> </attribute>
<attribute name="agent"> <text/> </attribute>
</group>
</optional>
<attribute name="op"> <text/> </attribute>
<attribute name="node"> <text/> </attribute>
<attribute name="call"> <data type="integer" /> </attribute>
<attribute name="rc"> <data type="nonNegativeInteger" /> </attribute>
<optional>
<attribute name="last-rc-change"> <text/> </attribute>
<attribute name="exec-time"> <data type="nonNegativeInteger" /> </attribute>
</optional>
<attribute name="status"> <text/> </attribute>
</element>
</define>
<define name="resource-agent-action">
<element name="resource-agent-action">
<attribute name="action"> <text/> </attribute>
<optional>
<attribute name="rsc"> <text/> </attribute>
</optional>
<attribute name="class"> <text/> </attribute>
<attribute name="type"> <text/> </attribute>
<optional>
<attribute name="provider"> <text/> </attribute>
</optional>
<optional>
<ref name="overrides-list"/>
</optional>
<ref name="agent-status"/>
<optional>
<element name="command">
<choice>
<text />
<externalRef href="subprocess-output-2.23.rng"/>
</choice>
</element>
</optional>
</element>
</define>
<define name="overrides-list">
<element name="overrides">
<zeroOrMore>
<element name="override">
<optional>
<attribute name="rsc"> <text/> </attribute>
</optional>
<attribute name="name"> <text/> </attribute>
<attribute name="value"> <text/> </attribute>
</element>
</zeroOrMore>
</element>
</define>
<define name="agent-status">
<element name="agent-status">
<attribute name="code"> <data type="integer" /> </attribute>
<optional>
<attribute name="message"> <text/> </attribute>
</optional>
<optional>
<attribute name="execution_code"> <data type="integer" /> </attribute>
</optional>
<optional>
<attribute name="execution_message"> <text/> </attribute>
</optional>
<optional>
<attribute name="reason"> <text/> </attribute>
</optional>
</element>
</define>
<define name="attribute-roles">
<choice>
<value>Stopped</value>
<value>Started</value>
<value>Promoted</value>
<value>Unpromoted</value>
<!-- These synonyms for Promoted/Unpromoted are allowed for
backward compatibility with output from older Pacemaker
versions that used them -->
<value>Master</value>
<value>Slave</value>
</choice>
</define>
</grammar>
diff --git a/xml/api/crm_simulate-2.28.rng b/xml/api/crm_simulate-2.28.rng
index 48cf942f67..58be93d705 100644
--- a/xml/api/crm_simulate-2.28.rng
+++ b/xml/api/crm_simulate-2.28.rng
@@ -1,338 +1,338 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start>
<ref name="element-crm-simulate"/>
</start>
<define name="element-crm-simulate">
<choice>
<ref name="timings-list" />
<group>
<ref name="cluster-status" />
<optional>
<ref name="modifications-list" />
</optional>
<optional>
<ref name="allocations-utilizations-list" />
</optional>
<optional>
<ref name="action-list" />
</optional>
<optional>
<ref name="cluster-injected-actions-list" />
<ref name="revised-cluster-status" />
</optional>
</group>
</choice>
</define>
<define name="allocations-utilizations-list">
<choice>
<element name="allocations">
<zeroOrMore>
<choice>
<ref name="element-allocation" />
<ref name="element-promotion" />
</choice>
</zeroOrMore>
</element>
<element name="utilizations">
<zeroOrMore>
<choice>
<ref name="element-capacity" />
<ref name="element-utilization" />
</choice>
</zeroOrMore>
</element>
<element name="allocations_utilizations">
<zeroOrMore>
<choice>
<ref name="element-allocation" />
<ref name="element-promotion" />
<ref name="element-capacity" />
<ref name="element-utilization" />
</choice>
</zeroOrMore>
</element>
</choice>
</define>
<define name="cluster-status">
<element name="cluster_status">
<ref name="nodes-list" />
<ref name="resources-list" />
<optional>
<ref name="node-attributes-list" />
</optional>
<optional>
<externalRef href="node-history-2.12.rng" />
</optional>
<optional>
<ref name="failures-list" />
</optional>
</element>
</define>
<define name="modifications-list">
<element name="modifications">
<optional>
<attribute name="quorum"> <text /> </attribute>
</optional>
<optional>
<attribute name="watchdog"> <text /> </attribute>
</optional>
<zeroOrMore>
<ref name="element-inject-modify-node" />
</zeroOrMore>
<zeroOrMore>
<ref name="element-inject-modify-ticket" />
</zeroOrMore>
<zeroOrMore>
<ref name="element-inject-spec" />
</zeroOrMore>
<zeroOrMore>
<ref name="element-inject-attr" />
</zeroOrMore>
</element>
</define>
<define name="revised-cluster-status">
<element name="revised_cluster_status">
<ref name="nodes-list" />
<ref name="resources-list" />
<optional>
<ref name="node-attributes-list" />
</optional>
<optional>
<ref name="failures-list" />
</optional>
</element>
</define>
<define name="element-inject-attr">
<element name="inject_attr">
<attribute name="cib_node"> <text /> </attribute>
<attribute name="name"> <text /> </attribute>
<attribute name="node_path"> <text /> </attribute>
<attribute name="value"> <text /> </attribute>
</element>
</define>
<define name="element-inject-modify-node">
<element name="modify_node">
<attribute name="action"> <text /> </attribute>
<attribute name="node"> <text /> </attribute>
</element>
</define>
<define name="element-inject-spec">
<element name="inject_spec">
<attribute name="spec"> <text /> </attribute>
</element>
</define>
<define name="element-inject-modify-ticket">
<element name="modify_ticket">
<attribute name="action"> <text /> </attribute>
<attribute name="ticket"> <text /> </attribute>
</element>
</define>
<define name="cluster-injected-actions-list">
<element name="transition">
<zeroOrMore>
<ref name="element-injected-actions" />
</zeroOrMore>
</element>
</define>
<define name="node-attributes-list">
<element name="node_attributes">
<zeroOrMore>
<externalRef href="node-attrs-2.8.rng" />
</zeroOrMore>
</element>
</define>
<define name="failures-list">
<element name="failures">
<zeroOrMore>
<externalRef href="failure-2.8.rng" />
</zeroOrMore>
</element>
</define>
<define name="nodes-list">
<element name="nodes">
<zeroOrMore>
- <externalRef href="nodes-2.29.rng" />
+ <externalRef href="nodes-2.28.rng" />
</zeroOrMore>
</element>
</define>
<define name="resources-list">
<element name="resources">
<zeroOrMore>
- <externalRef href="resources-2.29.rng" />
+ <externalRef href="resources-2.28.rng" />
</zeroOrMore>
</element>
</define>
<define name="timings-list">
<element name="timings">
<zeroOrMore>
<ref name="element-timing" />
</zeroOrMore>
</element>
</define>
<define name="action-list">
<element name="actions">
<zeroOrMore>
<ref name="element-node-action" />
</zeroOrMore>
<zeroOrMore>
<ref name="element-rsc-action" />
</zeroOrMore>
</element>
</define>
<define name="element-allocation">
<element name="node_weight">
<attribute name="function"> <text /> </attribute>
<attribute name="node"> <text /> </attribute>
<externalRef href="../score.rng" />
<optional>
<attribute name="id"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-capacity">
<element name="capacity">
<attribute name="comment"> <text /> </attribute>
<attribute name="node"> <text /> </attribute>
<zeroOrMore>
<element>
<anyName />
<text />
</element>
</zeroOrMore>
</element>
</define>
<define name="element-inject-cluster-action">
<element name="cluster_action">
<attribute name="node"> <text /> </attribute>
<attribute name="task"> <text /> </attribute>
<optional>
<attribute name="id"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-injected-actions">
<choice>
<ref name="element-inject-cluster-action" />
<ref name="element-inject-fencing-action" />
<ref name="element-inject-pseudo-action" />
<ref name="element-inject-rsc-action" />
</choice>
</define>
<define name="element-inject-fencing-action">
<element name="fencing_action">
<attribute name="op"> <text /> </attribute>
<attribute name="target"> <text /> </attribute>
</element>
</define>
<define name="element-node-action">
<element name="node_action">
<attribute name="node"> <text /> </attribute>
<attribute name="reason"> <text /> </attribute>
<attribute name="task"> <text /> </attribute>
</element>
</define>
<define name="element-promotion">
<element name="promotion_score">
<attribute name="id"> <text /> </attribute>
<externalRef href="../score.rng" />
<optional>
<attribute name="node"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-inject-pseudo-action">
<element name="pseudo_action">
<attribute name="task"> <text /> </attribute>
<optional>
<attribute name="node"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-inject-rsc-action">
<element name="rsc_action">
<attribute name="node"> <text /> </attribute>
<attribute name="op"> <text /> </attribute>
<attribute name="resource"> <text /> </attribute>
<optional>
<attribute name="interval"> <data type="integer" /> </attribute>
</optional>
</element>
</define>
<define name="element-timing">
<element name="timing">
<attribute name="file"> <text /> </attribute>
<attribute name="duration"> <data type="double" /> </attribute>
</element>
</define>
<define name="element-rsc-action">
<element name="rsc_action">
<attribute name="action"> <text /> </attribute>
<attribute name="resource"> <text /> </attribute>
<optional>
<attribute name="blocked"> <data type="boolean" /> </attribute>
</optional>
<optional>
<attribute name="dest"> <text /> </attribute>
</optional>
<optional>
<attribute name="next-role"> <text /> </attribute>
</optional>
<optional>
<attribute name="node"> <text /> </attribute>
</optional>
<optional>
<attribute name="reason"> <text /> </attribute>
</optional>
<optional>
<attribute name="role"> <text /> </attribute>
</optional>
<optional>
<attribute name="source"> <text /> </attribute>
</optional>
</element>
</define>
<define name="element-utilization">
<element name="utilization">
<attribute name="function"> <text /> </attribute>
<attribute name="node"> <text /> </attribute>
<attribute name="resource"> <text /> </attribute>
<zeroOrMore>
<element>
<anyName />
<text />
</element>
</zeroOrMore>
</element>
</define>
</grammar>
diff --git a/xml/api/nodes-2.28.rng b/xml/api/nodes-2.28.rng
index 7dd1798914..19b5c09cc0 100644
--- a/xml/api/nodes-2.28.rng
+++ b/xml/api/nodes-2.28.rng
@@ -1,54 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<start>
<ref name="element-full-node"/>
</start>
<define name="element-full-node">
<element name="node">
<attribute name="name"> <text/> </attribute>
<attribute name="id"> <text/> </attribute>
<attribute name="online"> <data type="boolean" /> </attribute>
<attribute name="standby"> <data type="boolean" /> </attribute>
<attribute name="standby_onfail"> <data type="boolean" /> </attribute>
<attribute name="maintenance"> <data type="boolean" /> </attribute>
<attribute name="pending"> <data type="boolean" /> </attribute>
<attribute name="unclean"> <data type="boolean" /> </attribute>
<optional>
<attribute name="health">
<choice>
<value>red</value>
<value>yellow</value>
<value>green</value>
</choice>
</attribute>
</optional>
<optional>
<attribute name="feature_set"> <text/> </attribute>
</optional>
<attribute name="shutdown"> <data type="boolean" /> </attribute>
<attribute name="expected_up"> <data type="boolean" /> </attribute>
<attribute name="is_dc"> <data type="boolean" /> </attribute>
<attribute name="resources_running"> <data type="nonNegativeInteger" /> </attribute>
<attribute name="type">
<choice>
<value>unknown</value>
<value>member</value>
<value>remote</value>
<value>ping</value>
</choice>
</attribute>
<optional>
<!-- for virtualized pacemaker_remote nodes, crm_mon 1.1.13 uses
"container_id" while later versions use "id_as_resource" -->
<choice>
<attribute name="container_id"> <text/> </attribute>
<attribute name="id_as_resource"> <text/> </attribute>
</choice>
</optional>
- <externalRef href="resources-2.29.rng" />
+ <externalRef href="resources-2.28.rng" />
</element>
</define>
</grammar>