From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-11521-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 7791 invoked by alias); 8 Jul 2009 16:40:54 -0000
Received: (qmail 7785 invoked by alias); 8 Jul 2009 16:40:53 -0000
X-SWARE-Spam-Status: No, hits=-0.5 required=5.0
	tests=AWL,BAYES_50,J_CHICKENPOX_73,SPF_HELO_PASS
X-Spam-Status: No, hits=-0.5 required=5.0
	tests=AWL,BAYES_50,J_CHICKENPOX_73,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 - config: Update cluster.rng with new RA params
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: 66b0782a517329a7eda37fd9c77f60a560a60db9
X-Git-Newrev: 561b8eaf01e7937d30b8c80643fa263ee2891778
From: Lon Hohberger <lon@fedoraproject.org>
Message-Id: <20090708163659.550A3120209@lists.fedorahosted.org>
Date: Wed, 08 Jul 2009 16:40: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/msg00018.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=561b8eaf01e7937d30b8c80643fa263ee2891778
Commit:        561b8eaf01e7937d30b8c80643fa263ee2891778
Parent:        66b0782a517329a7eda37fd9c77f60a560a60db9
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Wed Jul 8 12:04:42 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Wed Jul 8 12:05:00 2009 -0400

config: Update cluster.rng with new RA params

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 config/tools/xml/cluster.rng |   40 +++++++++++++++++-----------------------
 1 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng
index 23678bf..56d4ff6 100644
--- a/config/tools/xml/cluster.rng
+++ b/config/tools/xml/cluster.rng
@@ -1065,6 +1065,9 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="restart_expire_time"/>
         </optional>
+        <optional>
+          <attribute name="priority"/>
+        </optional>
       </group>
       </choice>
       <optional>
@@ -1650,31 +1653,13 @@ To validate your cluster.conf against this schema, run:
           <attribute name="recovery"/>
         </optional>
         <optional>
-          <attribute name="memory"/>
-        </optional>
-        <optional>
           <attribute name="migration_mapping"/>
         </optional>
         <optional>
-          <attribute name="bootloader"/>
-        </optional>
-        <optional>
-          <attribute name="path"/>
-        </optional>
-        <optional>
-          <attribute name="rootdisk_physical"/>
-        </optional>
-        <optional>
-          <attribute name="rootdisk_virtual"/>
-        </optional>
-        <optional>
-          <attribute name="swapdisk_physical"/>
+          <attribute name="use_virsh"/>
         </optional>
         <optional>
-          <attribute name="swapdisk_virtual"/>
-        </optional>
-        <optional>
-          <attribute name="vif"/>
+          <attribute name="xmlfile"/>
         </optional>
         <optional>
           <attribute name="migrate"/>
@@ -1694,6 +1679,15 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="restart_expire_time"/>
         </optional>
+        <optional>
+          <attribute name="hypervisor"/>
+        </optional>
+        <optional>
+          <attribute name="hypervisor_uri"/>
+        </optional>
+        <optional>
+          <attribute name="migration_uri"/>
+        </optional>
       </group>
       </choice>
       <optional>
@@ -1923,6 +1917,9 @@ To validate your cluster.conf against this schema, run:
           <attribute name="force_unmount"/>
         </optional>
         <optional>
+          <attribute name="quick_status"/>
+        </optional>
+        <optional>
           <attribute name="self_fence"/>
         </optional>
         <optional>
@@ -1937,9 +1934,6 @@ To validate your cluster.conf against this schema, run:
         <optional>
           <attribute name="options"/>
         </optional>
-        <optional>
-          <attribute name="quick_status"/>
-        </optional>
       </group>
       </choice>
       <optional>