From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7691 invoked by alias); 8 Jul 2009 16:40:52 -0000 Received: (qmail 7677 invoked by alias); 8 Jul 2009 16:40:51 -0000 X-SWARE-Spam-Status: No, hits=1.0 required=5.0 tests=AWL,BAYES_50,J_CHICKENPOX_26,J_CHICKENPOX_38,J_CHICKENPOX_39,J_CHICKENPOX_48,J_CHICKENPOX_73,J_CHICKENPOX_74,SPF_HELO_PASS X-Spam-Status: No, hits=1.0 required=5.0 tests=AWL,BAYES_50,J_CHICKENPOX_26,J_CHICKENPOX_38,J_CHICKENPOX_39,J_CHICKENPOX_48,J_CHICKENPOX_73,J_CHICKENPOX_74,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.ldif 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: 561b8eaf01e7937d30b8c80643fa263ee2891778 X-Git-Newrev: b150a76a70d1a5ed76ab0ec11819cb72919c3301 From: Lon Hohberger Message-Id: <20090708163701.768F6120282@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: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00017.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b150a76a70d1a5ed76ab0ec11819cb72919c3301 Commit: b150a76a70d1a5ed76ab0ec11819cb72919c3301 Parent: 561b8eaf01e7937d30b8c80643fa263ee2891778 Author: Lon Hohberger AuthorDate: Wed Jul 8 12:10:41 2009 -0400 Committer: Lon Hohberger CommitterDate: Wed Jul 8 12:10:41 2009 -0400 config: Update cluster.ldif Signed-off-by: Lon Hohberger --- config/plugins/ldap/99cluster.ldif | 80 ++++++++++++++++++++++++------------ config/plugins/ldap/ldap-base.csv | 16 ++++++- 2 files changed, 68 insertions(+), 28 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index e3d60b2..c23af02 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -1,4 +1,4 @@ -# Auto-generated from ../../tools/xml/cluster.rng +# Auto-generated from cluster.rng dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version' @@ -55,6 +55,18 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.228 NAME 'rhcsBroadcast' + 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.229 NAME 'rhcsDisable-openais' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.20 NAME 'rhcsAddr' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 @@ -487,6 +499,30 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.230 NAME 'rhcsRingnumber' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.231 NAME 'rhcsBindnetaddr' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.232 NAME 'rhcsMcastaddr' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( + 1.3.6.1.4.1.2312.8.1.1.233 NAME 'rhcsMcastport' + EQUALITY caseExactIA5Match + SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 + SINGLE-VALUE + ) +attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.87 NAME 'rhcsLog-level' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 @@ -1021,61 +1057,49 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.176 NAME 'rhcsMemory' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE - ) -attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.177 NAME 'rhcsMigration-mapping' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.178 NAME 'rhcsBootloader' + 1.3.6.1.4.1.2312.8.1.1.234 NAME 'rhcsUse-virsh' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.179 NAME 'rhcsRootdisk-physical' + 1.3.6.1.4.1.2312.8.1.1.235 NAME 'rhcsXmlfile' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.180 NAME 'rhcsRootdisk-virtual' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE - ) -attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.181 NAME 'rhcsSwapdisk-physical' + 1.3.6.1.4.1.2312.8.1.1.184 NAME 'rhcsMigrate' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.182 NAME 'rhcsSwapdisk-virtual' + 1.3.6.1.4.1.2312.8.1.1.185 NAME 'rhcsSnapshot' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.183 NAME 'rhcsVif' + 1.3.6.1.4.1.2312.8.1.1.236 NAME 'rhcsHypervisor' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.184 NAME 'rhcsMigrate' + 1.3.6.1.4.1.2312.8.1.1.237 NAME 'rhcsHypervisor-uri' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.185 NAME 'rhcsSnapshot' + 1.3.6.1.4.1.2312.8.1.1.238 NAME 'rhcsMigration-uri' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE @@ -1267,13 +1291,13 @@ attributeTypes: ( SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.217 NAME 'rhcsForce-fsck' + 1.3.6.1.4.1.2312.8.1.1.227 NAME 'rhcsQuick-status' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) attributeTypes: ( - 1.3.6.1.4.1.2312.8.1.1.227 NAME 'rhcsQuick-status' + 1.3.6.1.4.1.2312.8.1.1.217 NAME 'rhcsForce-fsck' EQUALITY caseExactIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE @@ -1338,7 +1362,7 @@ objectClasses: ( ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.3 NAME 'rhcsCman' SUP top STRUCTURAL - MAY( rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsExpected-votes $ rhcsTwo-node ) + MAY( rhcsDisable-openais $ rhcsBroadcast $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsExpected-votes $ rhcsTwo-node ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.8 NAME 'rhcsMulticast' SUP top STRUCTURAL @@ -1403,6 +1427,10 @@ objectClasses: ( MAY( rhcsKeyfile $ rhcsSecauth $ rhcsRrp-mode $ rhcsToken-retransmits-before-loss-const $ rhcsToken $ rhcsJoin $ rhcsConsensus ) ) objectClasses: ( + 1.3.6.1.4.1.2312.8.1.2.56 NAME 'rhcsInterface' SUP top STRUCTURAL + MAY( rhcsBroadcast $ rhcsMcastport $ rhcsMcastaddr $ rhcsBindnetaddr $ rhcsRingnumber ) + ) +objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.21 NAME 'rhcsRm' SUP top STRUCTURAL MAY( rhcsLog-facility $ rhcsCentral-processing $ rhcsTransition-throttling $ rhcsStatus-poll-interval $ rhcsStatusmax $ rhcsLog-level ) ) @@ -1447,7 +1475,7 @@ objectClasses: ( ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.31 NAME 'rhcsService' SUP top STRUCTURAL - MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsRestart-expire-time $ rhcsMax-restarts $ rhcsDepend-mode $ rhcsDepend $ rhcsRecovery $ rhcsNfs-client-cache $ rhcsNfslock $ rhcsExclusive $ rhcsHardrecovery $ rhcsAutostart $ rhcsDomain $ name $ rhcsRef ) + MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsPriority $ rhcsRestart-expire-time $ rhcsMax-restarts $ rhcsDepend-mode $ rhcsDepend $ rhcsRecovery $ rhcsNfs-client-cache $ rhcsNfslock $ rhcsExclusive $ rhcsHardrecovery $ rhcsAutostart $ rhcsDomain $ name $ rhcsRef ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.32 NAME 'rhcsIp' SUP top STRUCTURAL @@ -1507,7 +1535,7 @@ objectClasses: ( ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.46 NAME 'rhcsVm' SUP top STRUCTURAL - MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsRestart-expire-time $ rhcsMax-restarts $ rhcsDepend-mode $ rhcsDepend $ rhcsSnapshot $ rhcsMigrate $ rhcsVif $ rhcsSwapdisk-virtual $ rhcsSwapdisk-physical $ rhcsRootdisk-virtual $ rhcsRootdisk-physical $ rhcsPath $ rhcsBootloader $ rhcsMigration-mapping $ rhcsMemory $ rhcsRecovery $ rhcsExclusive $ rhcsHardrecovery $ rhcsAutostart $ rhcsDomain $ name $ rhcsRef ) + MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsMigration-uri $ rhcsHypervisor-uri $ rhcsHypervisor $ rhcsRestart-expire-time $ rhcsMax-restarts $ rhcsDepend-mode $ rhcsDepend $ rhcsSnapshot $ rhcsMigrate $ rhcsXmlfile $ rhcsUse-virsh $ rhcsMigration-mapping $ rhcsRecovery $ rhcsExclusive $ rhcsHardrecovery $ rhcsAutostart $ rhcsDomain $ name $ rhcsRef ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.47 NAME 'rhcsSAPInstance' SUP top STRUCTURAL @@ -1527,7 +1555,7 @@ objectClasses: ( ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.51 NAME 'rhcsFs' SUP top STRUCTURAL - MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsQuick-status $ rhcsOptions $ rhcsForce-fsck $ rhcsFsid $ rhcsNfslock $ rhcsSelf-fence $ rhcsForce-unmount $ rhcsFstype $ rhcsDevice $ rhcsMountpoint $ name $ rhcsRef ) + MAY( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsOptions $ rhcsForce-fsck $ rhcsFsid $ rhcsNfslock $ rhcsSelf-fence $ rhcsQuick-status $ rhcsForce-unmount $ rhcsFstype $ rhcsDevice $ rhcsMountpoint $ name $ rhcsRef ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.52 NAME 'rhcsOracledb' SUP top STRUCTURAL diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv index d6221e7..b90c39f 100644 --- a/config/plugins/ldap/ldap-base.csv +++ b/config/plugins/ldap/ldap-base.csv @@ -1,5 +1,5 @@ -# Max attribute value: 227 -# Max object class value: 55 +# Max attribute value: 238 +# Max object class value: 56 obj,rhcsCluster,cluster,1 obj,rhcsCman,cman,3 obj,rhcsTotem,totem,4 @@ -281,3 +281,15 @@ attr,rhcsBlade,blade,224 attr,rhcsLpan,lpan,225 attr,rhcsPserver,pserver,226 attr,rhcsQuick-status,quick_status,227 +attr,rhcsBroadcast,broadcast,228 +attr,rhcsDisable-openais,disable_openais,229 +obj,rhcsInterface,interface,56 +attr,rhcsRingnumber,ringnumber,230 +attr,rhcsBindnetaddr,bindnetaddr,231 +attr,rhcsMcastaddr,mcastaddr,232 +attr,rhcsMcastport,mcastport,233 +attr,rhcsUse-virsh,use_virsh,234 +attr,rhcsXmlfile,xmlfile,235 +attr,rhcsHypervisor,hypervisor,236 +attr,rhcsHypervisor-uri,hypervisor_uri,237 +attr,rhcsMigration-uri,migration_uri,238