From mboxrd@z Thu Jan 1 00:00:00 1970 From: ccaulfield@sourceware.org Date: 7 Jul 2008 12:32:41 -0000 Subject: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-52-g22f1d68 Message-ID: <20080707123241.9429.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=22f1d68a1739dfef05846018ac0e8a51b72b78e7 The branch, master has been updated via 22f1d68a1739dfef05846018ac0e8a51b72b78e7 (commit) from 0e0d1b960e8d03c921170862adc52c7e122a5f22 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 22f1d68a1739dfef05846018ac0e8a51b72b78e7 Author: Christine Caulfield Date: Mon Jul 7 13:32:02 2008 +0100 [CONFIG] Add some more ldap comments Show what sort of cluster.conf file, the ldap example maps onto. Fix some schema errors. Signed-off-by: Christine Caulfield ----------------------------------------------------------------------- Summary of changes: config/plugins/ldap/99cluster.ldif | 24 +++++++++++++-- config/plugins/ldap/example.ldif | 58 ++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index 2f0091d..bd2d843 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -3,7 +3,7 @@ # # This schema is incomplete, and probably always will be # - +# dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version' @@ -89,6 +89,13 @@ attributeTypes: ( 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.13 NAME 'rhcsPort' + DESC 'Port number for fence agent or cman' + EQUALITY IntegerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 + SINGLE-VALUE + ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.1 NAME 'rhcsCluster' SUP top STRUCTURAL DESC 'Cluster top-level entry' @@ -103,8 +110,8 @@ objectClasses: ( objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.3 NAME 'rhcsCman' SUP top STRUCTURAL DESC 'Cluster node entry' - MUST ( cn $ name $ rhcsNodeid ) - MAY ( rhcsCluster-id $ rhcsTwo-node $ rhcsExpected-votes $ rhcsMax-queued ) + MUST ( cn ) + MAY ( rhcsCluster-id $ rhcsTwo-node $ rhcsExpected-votes $ rhcsMax-queued $ rhcsPort ) ) objectClasses: ( 1.3.6.1.4.1.2312.8.1.2.4 NAME 'rhcsTotem' SUP top STRUCTURAL @@ -118,3 +125,14 @@ objectClasses: ( MUST ( name $ rhcsAgent ) MAY ( rhcsIpaddr $ rhcsUsername $ rhcsPassword ) ) +objectClasses: ( + 1.3.6.1.4.1.2312.8.1.2.6 NAME 'rhcsFenceagent' SUP top STRUCTURAL + DESC 'A Fence device' + MUST ( name ) + MAY ( rhcsPort ) + ) +objectClasses: ( + 1.3.6.1.4.1.2312.8.1.2.7 NAME 'rhcsFencemethod' SUP top STRUCTURAL + DESC 'A Fence method placeholder' + MUST ( name ) +) diff --git a/config/plugins/ldap/example.ldif b/config/plugins/ldap/example.ldif index e7cb99d..0182dcf 100644 --- a/config/plugins/ldap/example.ldif +++ b/config/plugins/ldap/example.ldif @@ -1,5 +1,53 @@ - # Example cluster LDIF file +# Christine Caulfield +# +# You WILL need to change this to suit your needs, in particular a search +# and replace of dc=chrissie,dc=net with your own domanin name. +# +# Load with: +# ldapmodify -x -a -D"cn=Directory Manager" -f example.ldif -c -v -W +# +# +# What follows is the LDAP equivalent of the following cluster.conf file: +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# +# + dn: cn=cluster,dc=chrissie,dc=net cn: cluster objectClass: rhcsCluster @@ -46,7 +94,7 @@ objectclass: nsContainer dn: name=apc,cn=method,cn=fence,name=jeltz,cn=clusternode,cn=clusternodes,cn=cluster,dc=chrissie,dc=net name: apc -objectclass: nsContainer +objectclass: rhcsFenceMethod dn: cn=device,name=apc,cn=method,cn=fence,name=jeltz,cn=clusternode,cn=clusternodes,cn=cluster,dc=chrissie,dc=net cn: device @@ -54,8 +102,8 @@ objectclass: nsContainer dn: name=myapc,cn=device,name=apc,cn=method,cn=fence,name=jeltz,cn=clusternode,cn=clusternodes,cn=cluster,dc=chrissie,dc=net name: myapc -objectclass: nsContainer -port=4 +objectclass: rhcsFenceAgent +rhcsPort: 4 dn: name=arthur,cn=clusternode,cn=clusternodes,cn=cluster,dc=chrissie,dc=net objectClass: rhcsNode @@ -86,4 +134,4 @@ name: myapc rhcsAgent: fence_apc rhcsIpaddr: myapc.chrissie.net rhcsUsername: apc -rhcsPassword: apc \ No newline at end of file +rhcsPassword: apc hooks/post-receive -- Cluster Project