From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11622-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 14849 invoked by alias); 28 Jul 2009 19:36:38 -0000
Received: (qmail 14843 invoked by alias); 28 Jul 2009 19:36:37 -0000
X-SWARE-Spam-Status: No, hits=-2.0 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Status: No, hits=-2.0 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bastion2.fedora.phx.redhat.com
Subject: cluster: STABLE3 - cluster.rng: comments around fence devices
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: cluster.git
X-Git-Refname: refs/heads/STABLE3
X-Git-Reftype: branch
X-Git-Oldrev: 25dd066e31c42b188fbd686f3b85358d0435db9e
X-Git-Newrev: ac9ba8add8ef6fdacdaf766026741e42101ba11b
From: David Teigland <teigland@fedoraproject.org>
Message-Id: <20090728193605.BF56012022C@lists.fedorahosted.org>
Date: Tue, 28 Jul 2009 19:36:00 -0000
X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q3/txt/msg00119.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ac9ba8add8ef6fdacdaf766026741e42101ba11b
Commit:        ac9ba8add8ef6fdacdaf766026741e42101ba11b
Parent:        25dd066e31c42b188fbd686f3b85358d0435db9e
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Tue Jul 28 14:26:46 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Tue Jul 28 14:26:46 2009 -0500

cluster.rng: comments around fence devices

trying to understand the structure

Signed-off-by: David Teigland <teigland@redhat.com>
---
 config/tools/xml/cluster.rng |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index ee54f04..2936cf7 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -672,6 +672,9 @@ To validate your cluster.conf against this schema, run:
          be used." rha:sample="fence_apc"/>
      <optional>
       <choice>
+       <!-- begin specific fence devices -->
+
+       <!-- begin non-generated device definitions -->
        <!-- RPS10 -->
        <group rha:description="RPS10 Serial Switch" >
         <attribute name="device" rha:description="The device the switch
@@ -761,8 +764,9 @@ To validate your cluster.conf against this schema, run:
        <group>
         <attribute name="rpowerpath" rha:description="" rha:sample=""/>
        </group>
+       <!-- end non-generated device definitions -->
 
-<!-- autogenerated ones -->
+       <!-- begin auto-generated device definitions -->
       <!-- fence_alom -->
       <group>
         <optional>
@@ -1097,15 +1101,15 @@ To validate your cluster.conf against this schema, run:
           <attribute name="timeout"/>
         </optional>
       </group>
+       <!-- end auto-generated device definitions -->
 
-<!-- end autogenerated -->
-
-       <!-- manual -->
        <group>
         <optional>
          <empty/>
         </optional>
        </group>
+
+       <!-- end specific fence devices -->
       </choice>
      </optional>
     </element>
@@ -2301,7 +2305,7 @@ To validate your cluster.conf against this schema, run:
 <!-- End autogenerated resources definitions -->
 <!--End of resource definitions-->
 
-<!--Beginning of fence definitions-->
+<!-- begin node fence definitions -->
 
  <define name="FENCE">
   <element name="fence" rha:description="The fence element specifies how
@@ -2338,8 +2342,9 @@ To validate your cluster.conf against this schema, run:
     <data type="IDREF"/>
    </attribute>
    <choice>
+      <!-- begin node fence specific devices -->
 
-<!-- autogenerated -->
+      <!-- begin auto-generated device definitions -->
       <!-- fence_alom -->
       <group>
         <optional>
@@ -2662,8 +2667,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="timeout"/>
         </optional>
       </group>
+      <!-- end auto-generated device definitions -->
 
-
+      <!-- begin non-generated device definitions -->
         <!-- Brocade, Vixel, McData, SANBox2 -->
         <group>
          <attribute name="port"/>
@@ -2734,7 +2740,12 @@ To validate your cluster.conf against this schema, run:
           <attribute name="domain"/>
          </optional>
         </group>
-       </choice>
-      </element>
-     </define>
+      <!-- end non-generated device definitions -->
+
+   <!-- end node fence specific devices -->
+   </choice>
+  </element>
+ </define>
+<!-- end node fence definitions -->
+
 </grammar>