public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: David Teigland <teigland@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: STABLE3 - cluster.rng: various fixes
Date: Mon, 27 Jul 2009 21:14:00 -0000	[thread overview]
Message-ID: <20090727211416.EDCDF120307@lists.fedorahosted.org> (raw)

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5435 bytes --]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0fd3604ad2ee638f86cfe2b33a7588158391a8e5
Commit:        0fd3604ad2ee638f86cfe2b33a7588158391a8e5
Parent:        48aba4efedc8095260d3c0edc33edf572405137e
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Mon Jul 27 16:01:30 2009 -0500
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Mon Jul 27 16:03:25 2009 -0500

cluster.rng: various fixes

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

diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index c424087..fe90dc9 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -33,7 +33,7 @@ To validate your cluster.conf against this schema, run:
     top-level element and contains attributes that define the cluster
     name and the configuration version number.">
  <attribute name="name" rha:description="Specifies a unique cluster name;
-      it can be up to 16 characters long." rha:sample="my_rh_cluster"/>
+      it can be up to 16 characters long." rha:sample="my_cluster"/>
  <attribute name="config_version" rha:description="Identifies the
      revision level of the cluster.conf file. To propagate a revised
      configuration file, this value must be advanced to a value higher
@@ -42,7 +42,7 @@ To validate your cluster.conf against this schema, run:
   <attribute name="alias" rha:description="Pretty name for cluster that
       is not parsed by cluster tag software; only the Conga and
       system-config-cluster GUIs use this value."
-      rha:sample="My Red Hat Cluster"/>
+      rha:sample="My Cluster"/>
  </optional>
  <interleave>
 
@@ -194,9 +194,6 @@ To validate your cluster.conf against this schema, run:
    </zeroOrMore>
  </element>
 
-<!--FIXME: More information needed for dlm. I looked in dlm_controld man
-page; however, configuration paramaters there do not seem to match the
-following elements and attributes. -->
 <!-- dlm block -->
  <optional>
  <element name="dlm" rha:description="">
@@ -241,6 +238,24 @@ following elements and attributes. -->
   <optional>
    <attribute name="drop_resources_age" rha:description="" rha:sample=""/>
   </optional>
+  <optional>
+   <zeroOrMore>
+    <element name="lockspace" rha:description="">
+     <attribute name="name" rha:description="" rha:sample=""/>
+     <optional>
+      <attribute name="nodir" rha:description="" rha:sample=""/>
+     </optional>
+     <optional>
+      <zeroOrMore>
+       <element name="master" rha:description="">
+        <attribute name="name" rha:description="" rha:sample=""/>
+        <attribute name="weight" rha:description="" rha:sample=""/>
+       </element>
+      </zeroOrMore>
+     </optional>
+    </element>
+   </zeroOrMore>
+  </optional>
  </element>
  </optional>
 <!-- end dlm block -->
@@ -290,24 +305,6 @@ following elements and attributes. -->
      that a cached resource should be unused before consideration for
      dropping." rha:sample="5000" rha:default="10000"/>
   </optional>
-  <optional>
-   <zeroOrMore>
-    <element name="lockspace" rha:description="">
-     <attribute name="name" rha:description="" rha:sample=""/>
-     <optional>
-      <attribute name="nodir" rha:description="" rha:sample=""/>
-     </optional>
-     <optional>
-      <zeroOrMore>
-       <element name="master" rha:description="">
-        <attribute name="name" rha:description="" rha:sample=""/>
-        <attribute name="weight" rha:description="" rha:sample=""/>
-       </element>
-      </zeroOrMore>
-     </optional>
-    </element>
-   </zeroOrMore>
-  </optional>
  </element>
  </optional>
 <!-- end gfs_controld block --> 
@@ -915,8 +912,8 @@ block before determining success or failure.
     <attribute name="logfile_priority" rha:description="" rha:sample=""/>
    </optional>
    <optional>
-    <element name="logging_subsys" rha:description="">
-     <attribute name="subsys" rha:description="" rha:sample=""/>
+    <element name="logging_daemon" rha:description="">
+     <attribute name="name" rha:description="" rha:sample=""/>
      <optional>
       <attribute name="to_syslog" rha:description="" rha:sample=""/>
      </optional>
@@ -985,7 +982,7 @@ block before determining success or failure.
         slightly lower latency from transmit to delivery in faulty
         network environments but with less performance. Passive
         replication may nearly double the speed of the totem protocol
-        if the protocol doesn’t become cpu bound. The final option is
+        if the protocol doesn't become cpu bound. The final option is
         none, in which case only one network interface is used to
         operate the totem protocol. If only one interface directive is
         specified, none is automatically chosen. If multiple interface
@@ -1218,8 +1215,6 @@ block before determining success or failure.
        to prevent any startup fencing the daemon might do." rha:default="0"
        rha:sample="1"/>
    </optional>
-   <!--FIXME: This attribute is in the proposed RHEL5 schema; verify if
-  it should be in stable3.
    <optional>
     <attribute name="skip_undefined" rha:description="Do not do startup
        fencing of nodes with no fence methods defined." rha:default="0"


                 reply	other threads:[~2009-07-27 21:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090727211416.EDCDF120307@lists.fedorahosted.org \
    --to=teigland@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).