cluster: RHEL6 - config: make altname validation position indipendent

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e48...
Commit:        e48f97cd32ecb5b595449fd946226e47f69880d3
Parent:        d2fdb9c524b53203effa7d4150b5ee20b6cbe8cb
Author:        Fabio M. Di Nitto 
AuthorDate:    Mon Nov 28 10:47:56 2011 +0100
Committer:     Fabio M. Di Nitto 
CommitterDate: Wed Mar 7 14:48:19 2012 +0100

config: make altname validation position indipendent

Resolves: rhbz#740552

Signed-off-by: Lon Hohberger 
Signed-off-by: Fabio M. Di Nitto 
---
 config/tools/xml/cluster.rng.in.head |   55 +++++++++++++++++++---------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/config/tools/xml/cluster.rng.in.head b/config/tools/xml/cluster.rng.in.head
index e6e4633..11d5052 100644
--- a/config/tools/xml/cluster.rng.in.head
+++ b/config/tools/xml/cluster.rng.in.head
@@ -785,32 +785,11 @@ To validate your cluster.conf against this schema, run:
         dlm_controld(8)"/>
    </optional>

-   <optional>
-    <element name="altname" rha:description="Defines a second network
-        interface to use for corosync redundant ring mode. cman(5)">
-
-     <attribute name="name" rha:description="A second hostname or IP
-        address of the node. cman(5)"/>
-
-     <optional>
-      <attribute name="port" rha:description="The network port to use
-          on the second interface. cman(5)"/>
-     </optional>
-
-     <optional>
-      <attribute name="mcast" rha:description="The multicast address
-          to use on the second interface. cman(5)"/>
-     </optional>
-
-     <optional>
-      <attribute name="ttl" rha:description="The multicast TTL 
-          to use on the second interface. cman(5)"/>
-     </optional>
-    </element>
-   </optional>
-
    <interleave>
     <optional>
+     <ref name="ALTNAME"/>
+    </optional>
+    <optional>
      <ref name="FENCE"/>
     </optional>
     <optional>
@@ -1034,6 +1013,34 @@ To validate your cluster.conf against this schema, run:
 </element> <!-- cluster end -->
 </start>

+<!-- begin node altname definitions -->
+
+ <define name="ALTNAME">
+    <element name="altname" rha:description="Defines a second network
+        interface to use for corosync redundant ring mode. cman(5)">
+
+     <attribute name="name" rha:description="A second hostname or IP
+        address of the node. cman(5)"/>
+
+     <optional>
+      <attribute name="port" rha:description="The network port to use
+          on the second interface. cman(5)"/>
+     </optional>
+
+     <optional>
+      <attribute name="mcast" rha:description="The multicast address
+          to use on the second interface. cman(5)"/>
+     </optional>
+
+     <optional>
+      <attribute name="ttl" rha:description="The multicast TTL 
+          to use on the second interface. cman(5)"/>
+     </optional>
+    </element>
+ </define>
+
+<!-- end node altname definitions -->
+
 <!-- begin node fence definitions -->

<define name="FENCE">