[Cluster-devel] [PATCH 2/2] rng: FO validation: no use of nofailback in unordered domain

[Jan Pokorný]

and datatype also the "ordered" counterpart of the schema

Signed-off-by: Jan Pokorný <jpokorny at redhat.com>
---
 config/tools/xml/cluster.rng.in.head | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index 919ff5e..2d01767 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -910,10 +910,8 @@ To validate your cluster.conf against this schema, run:
        </optional>
        <choice>
         <group>
-         <!-- unordered group (no or zero priority at failoverdomainnode) -->
-         <optional>
-          <attribute name="nofailback" rha:description="Do not move service to a more preferred node if it is currently running." rha:sample=""/>
-         </optional>
+         <!-- unordered group (no or zero priority at failoverdomainnode
+              and no or zero nofailback) -->
          <optional>
           <attribute name="ordered" rha:description="Set value to 1 if
             the failover domain is ordered; set value to 0 if
@@ -921,6 +919,11 @@ To validate your cluster.conf against this schema, run:
              <value type="int">0</value>
           </attribute>
          </optional>
+         <optional>
+          <attribute name="nofailback" rha:description="Do not move service to a more preferred node if it is currently running." rha:sample="">
+           <value type="int">0</value>
+          </attribute>
+         </optional>
          <zeroOrMore>
           <element name="failoverdomainnode" rha:description="A node in
             a failover domain">
@@ -939,9 +942,6 @@ To validate your cluster.conf against this schema, run:
         </group>
         <group>
          <!-- ordered group (no or 0 <= priority <= 100  at failoverdomainnode allowed) -->
-         <optional>
-          <attribute name="nofailback" rha:description="Do not move service to a more preferred node if it is currently running." rha:sample=""/>
-         </optional>
          <attribute name="ordered" rha:description="Set value to 1 if
            the failover domain is ordered; set value to 0 if
            unordered." rha:default="0" rha:sample="1">
@@ -951,6 +951,11 @@ To validate your cluster.conf against this schema, run:
            </except>
           </data>
          </attribute>
+         <optional>
+          <attribute name="nofailback" rha:description="Do not move service to a more preferred node if it is currently running." rha:sample="">
+           <data type="int"/>
+          </attribute>
+         </optional>
          <zeroOrMore>
           <element name="failoverdomainnode" rha:description="A node in
             a failover domain">
-- 
1.8.5.3