From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11003 invoked by alias); 27 Mar 2009 15:10:06 -0000 Received: (qmail 10796 invoked by alias); 27 Mar 2009 15:10:05 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_26,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_26,J_CHICKENPOX_73,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - config: Type checking fixups in schemas 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: a292ce5347b3c985a24fa3abfe631cc32527dc48 X-Git-Newrev: c95cf4b05ba0c7b81559f06a5ee825389d8c70ce From: Lon Hohberger Message-Id: <20090327150934.2993D120150@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 15:10: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: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00924.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c95cf4b05ba0c7b81559f06a5ee825389d8c70ce Commit: c95cf4b05ba0c7b81559f06a5ee825389d8c70ce Parent: a292ce5347b3c985a24fa3abfe631cc32527dc48 Author: Lon Hohberger AuthorDate: Fri Mar 27 11:09:04 2009 -0400 Committer: Lon Hohberger CommitterDate: Fri Mar 27 11:09:04 2009 -0400 config: Type checking fixups in schemas Signed-off-by: Lon Hohberger --- config/plugins/ldap/99cluster.ldif | 54 ++++++++++++++++++------------------ config/tools/xml/cluster.rng | 20 ++++++++++--- 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index 1faf129..e9c0320 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -1,9 +1,9 @@ -# Auto-generated from cluster.rng +# Auto-generated from ../../tools/xml/cluster.rng dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( @@ -20,26 +20,26 @@ attributeTypes: ( ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.6 NAME 'rhcsExpected-votes' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.16 NAME 'rhcsQuorum-dev-poll' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.17 NAME 'rhcsShutdown-timeout' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.18 NAME 'rhcsCcsd-poll' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( @@ -50,8 +50,8 @@ attributeTypes: ( ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.13 NAME 'rhcsPort' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( @@ -62,14 +62,14 @@ attributeTypes: ( ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.4 NAME 'rhcsVotes' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.2 NAME 'rhcsNodeid' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( @@ -488,32 +488,32 @@ attributeTypes: ( ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.87 NAME 'rhcsLog-level' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.88 NAME 'rhcsStatusmax' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.89 NAME 'rhcsStatus-poll-interval' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.90 NAME 'rhcsTransition-throttling' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.91 NAME 'rhcsCentral-processing' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) attributeTypes: ( diff --git a/config/tools/xml/cluster.rng b/config/tools/xml/cluster.rng index 24b6ee8..7958069 100644 --- a/config/tools/xml/cluster.rng +++ b/config/tools/xml/cluster.rng @@ -30,7 +30,9 @@ To validate your cluster.conf against this schema, run: - + + + @@ -49,19 +51,27 @@ To validate your cluster.conf against this schema, run: - + + + - + + + - + + + - + + +