Merging upstream version 2.1.8~rc1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 46 insertions, 0 deletions

diff --git a/xml/api/options-2.36.rng b/xml/api/options-2.36.rng
new file mode 100644
index 0000000..280e398
--- /dev/null
+++ b/xml/api/options-2.36.rng
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+
+    <!--
+     Pacemaker outputs option lists in an OCF-like XML format, but there are
+     differences that break validation against the unaltered schema.
+     -->
+
+    <include href="ocf-ra-1.1.rng">
+        <!--
+         The OCF RA 1.1 schema requires an actions element. Pacemaker option
+         lists don't include an actions element.
+         -->
+        <define name="element-actions">
+            <empty />
+        </define>
+    </include>
+
+    <!-- Extend the allowed types (see Pacemaker Explained for details) -->
+    <define name="atomic-types" combine="choice">
+        <choice>
+            <value>duration</value>
+            <value>epoch_time</value>
+            <value>nonnegative_integer</value>
+            <value>percentage</value>
+            <value>port</value>
+            <value>score</value>
+            <value>timeout</value>
+            <value>version</value>
+
+            <!-- @COMPAT Deprecated -->
+            <value>time</value>
+        </choice>
+    </define>
+
+    <!-- Pacemaker options have additional parameter attributes -->
+    <define name="parameter-attributes" combine="interleave">
+        <!-- Parameter is for advanced use only -->
+        <attribute name="advanced" />
+
+        <!-- Parameter's value is Pacemaker-generated, not user-configured -->
+        <attribute name="generated" />
+    </define>
+
+</grammar>