From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11666-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 9471 invoked by alias); 6 Aug 2009 20:21:15 -0000
Received: (qmail 9465 invoked by alias); 6 Aug 2009 20:21:15 -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: add stuff
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: 2a95cd1d40bab8ef5966febda4566f3b80fe0bd3
X-Git-Newrev: bb95419abc7e444af61e2c821a62a8832d275145
From: David Teigland <teigland@fedoraproject.org>
Message-Id: <20090806202048.3EC1E12019B@lists.fedorahosted.org>
Date: Thu, 06 Aug 2009 20:21: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/msg00163.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bb95419abc7e444af61e2c821a62a8832d275145
Commit:        bb95419abc7e444af61e2c821a62a8832d275145
Parent:        2a95cd1d40bab8ef5966febda4566f3b80fe0bd3
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Thu Aug 6 15:10:39 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Thu Aug 6 15:10:39 2009 -0500

cluster.rng: add stuff

add missing cman attributes, add descriptions for logging

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

diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index f7ad55f..318afd6 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -112,7 +112,10 @@ To validate your cluster.conf against this schema, run:
      </attribute>
     </optional>
     <optional>
-     <attribute name="disable_openais" rha:description="" rha:sample=""/>
+     <attribute name="keyfile" rha:description=""/>
+    </optional>
+    <optional>
+     <attribute name="disable_openais"/>
     </optional>
     <optional>
      <element name="multicast" rha:description="The multicast element
@@ -571,7 +574,8 @@ To validate your cluster.conf against this schema, run:
  <optional>
  <element name="group" rha:description="">
   <optional>
-   <attribute name="groupd_compat" rha:description="" rha:sample=""/>
+   <attribute name="groupd_compat" rha:description="Enable compatibility with
+     cluster2 (RHEL5) nodes" rha:default="0" rha:sample="1"/>
   </optional>
  </element>
  </optional>
@@ -579,51 +583,64 @@ To validate your cluster.conf against this schema, run:
 
 <!-- logging block -->
  <optional>
-  <element name="logging" rha:description="">
+  <element name="logging" rha:description="Global logging config applies
+    to all daemons.">
    <optional>
-    <attribute name="to_syslog" rha:description="" rha:sample=""/>
+    <attribute name="to_syslog" rha:description="enable/disable messages to
+      syslog" rha:default="yes"/>
    </optional>
    <optional>
-    <attribute name="to_logfile" rha:description="" rha:sample=""/>
+    <attribute name="to_logfile" rha:description="enable/disable messages to
+      log file" rha:default="yes"/>
    </optional>
    <optional>
-    <attribute name="syslog_facility" rha:description="" rha:sample=""/>
+    <attribute name="syslog_facility" rha:description="facility used for
+      syslog messages" rha:default="daemon"/>
    </optional>
    <optional>
-    <attribute name="syslog_priority" rha:description="" rha:sample=""/>
+    <attribute name="syslog_priority" rha:description="messages at this level
+      and up will be sent to syslog" rha:default="info"/>
    </optional>
    <optional>
-    <attribute name="logfile" rha:description="" rha:sample=""/>
+    <attribute name="logfile_priority" rha:description="messages at this level
+      and up will be written to log file" rha:default="info"/>
    </optional>
    <optional>
-    <attribute name="debug" rha:description="" rha:sample=""/>
+    <attribute name="logfile" rha:description="the log file name"
+      rha:default="/var/log/cluster/daemon_name.log"/>
    </optional>
    <optional>
-    <attribute name="logfile_priority" rha:description="" rha:sample=""/>
+    <attribute name="debug" rha:description="turn on debugging, a shortcut for
+      setting logfile_priority to debug" rha:sample="on"/>
    </optional>
    <optional>
-    <element name="logging_daemon" rha:description="">
-     <attribute name="name" rha:description="" rha:sample=""/>
+    <element name="logging_daemon" rha:description="Per-daemon logging
+      config overrides global settings for named daemon.">
+     <attribute name="name" rha:description="daemon name" rha:sample="fenced"/>
+     <optional>
+      <attribute name="subsys" rha:description="corosync subsystem name"
+        rha:sample="CMAN"/>
+     </optional>
      <optional>
-      <attribute name="to_syslog" rha:description="" rha:sample=""/>
+      <attribute name="to_syslog" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="to_logfile" rha:description="" rha:sample=""/>
+      <attribute name="to_logfile" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="syslog_facility" rha:description="" rha:sample=""/>
+      <attribute name="syslog_facility" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="syslog_priority" rha:description="" rha:sample=""/>
+      <attribute name="syslog_priority" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="logfile" rha:description="" rha:sample=""/>
+      <attribute name="logfile_priority" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="debug" rha:description="" rha:sample=""/>
+      <attribute name="logfile" rha:description="same as global"/>
      </optional>
      <optional>
-      <attribute name="logfile_priority" rha:description="" rha:sample=""/>
+      <attribute name="debug" rha:description="same as global"/>
      </optional>
     </element>
    </optional>