From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11612-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 24877 invoked by alias); 27 Jul 2009 21:23:48 -0000
Received: (qmail 24871 invoked by alias); 27 Jul 2009 21:23:48 -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: cluster_id and nodeid
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: 4be2a85079cd05df9dd07b555f88ad0184d9f7a5
X-Git-Newrev: 5d55508f14db4363cd78759e6988a915fed1a417
From: David Teigland <teigland@fedoraproject.org>
Message-Id: <20090727212314.30537120307@lists.fedorahosted.org>
Date: Mon, 27 Jul 2009 21:23: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/msg00109.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5d55508f14db4363cd78759e6988a915fed1a417
Commit:        5d55508f14db4363cd78759e6988a915fed1a417
Parent:        4be2a85079cd05df9dd07b555f88ad0184d9f7a5
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Mon Jul 27 16:14:10 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon Jul 27 16:14:10 2009 -0500

cluster.rng: cluster_id and nodeid

add cluster_id, fix up nodeid

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

diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index 1fb1b65..7954ab0 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -104,6 +104,11 @@ To validate your cluster.conf against this schema, run:
      </attribute>
     </optional>
     <optional>
+     <attribute name="cluster_id">
+      <data type="nonNegativeInteger"/>
+     </attribute>
+    </optional>
+    <optional>
      <attribute name="broadcast">
       <data type="nonNegativeInteger"/>
      </attribute>
@@ -149,19 +154,9 @@ To validate your cluster.conf against this schema, run:
 	   <data type="positiveInteger"/>
 	 </attribute>
        </optional>
-       <!--FIXME: Verify if the nodeid attribute is optional. I think
-       it is required for RHEL 5. The sources.redhat.com site states
-       that the attribute is required; however, that must mean that a
-       cluster.conf file must have a nodeid for each node. The value
-       is automatically assigned a value; however, you can change its
-       value.-->
        <optional>
-	 <attribute name="nodeid" rha:description="Each node is assigned
-             a unique integer value as its node ID. You can change a
-             node's nodeid; hoever, it must be a unique integer value
-             in the cluster. A node's application to join a cluster may
-             be rejected if you try to set the nodeid to one that is
-             already used in a cluster." rha:sample="1">
+	 <attribute name="nodeid" rha:description="Each node requires
+             a unique integer value as its node ID." rha:sample="1">
 	   <data type="positiveInteger"/>
 	 </attribute>
        </optional>
@@ -1220,8 +1215,6 @@ block before determining success or failure.
        fencing of nodes with no fence methods defined." rha:default="0"
        rha:sample="1"/>
    </optional>
-   -->
-
   </element>
  </optional>