cluster: STABLE3 - config: Add hash_cluster_id to schema

[Lon Hohberger]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        7fde51f8331e11e1a8cfcaa00bc90c9cc5d420f5
Parent:        ac01c1edf361561e9831b36f33c10f60d8aa0742
Author:        Lon Hohberger <lhh(a)redhat.com&gt;
AuthorDate:    Tue Mar 23 16:48:54 2010 -0400
Committer:     Lon Hohberger <lhh(a)redhat.com&gt;
CommitterDate: Tue Mar 23 16:48:54 2010 -0400

config: Add hash_cluster_id to schema

Signed-off-by: Lon Hohberger <lhh(a)redhat.com&gt;
---
 config/plugins/ldap/99cluster.ldif |   10 ++++++++--
 config/plugins/ldap/ldap-base.csv  |    3 ++-
 config/tools/xml/cluster.rng.in    |    3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 4039bb6..b4d4812 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2010-02-10 13:29:29
+# Auto-generated @ 2010-03-23 16:45:04
 dn: cn=schema
 attributeTypes: (
   1.3.6.1.4.1.2312.8.1.1.1 NAME 'rhcsConfig-version'
@@ -67,6 +67,12 @@ attributeTypes: (
   SINGLE-VALUE
   )
 attributeTypes: (
+  1.3.6.1.4.1.2312.8.1.1.274 NAME 'rhcsHash-cluster-id'
+  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.45 NAME 'rhcsNodename'
   EQUALITY caseExactIA5Match
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
@@ -1543,7 +1549,7 @@ objectClasses: (
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.3 NAME 'rhcsCman' SUP top STRUCTURAL
      MUST ( cn )
-     MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $
rhcsCluster-id $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $ rhcsShutdown-timeout $
rhcsQuorum-dev-poll $ rhcsDisallowed $ rhcsUpgrading $ rhcsExpected-votes $ rhcsTwo-node
)
+     MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $
rhcsHash-cluster-id $ rhcsCluster-id $ rhcsPort $ rhcsDebug-mask $ rhcsCcsd-poll $
rhcsShutdown-timeout $ rhcsQuorum-dev-poll $ rhcsDisallowed $ rhcsUpgrading $
rhcsExpected-votes $ rhcsTwo-node )
    )
 objectClasses: (
      1.3.6.1.4.1.2312.8.1.2.8 NAME 'rhcsMulticast' SUP top STRUCTURAL
diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv
index 14c8f06..faec32b 100644
--- a/config/plugins/ldap/ldap-base.csv
+++ b/config/plugins/ldap/ldap-base.csv
@@ -1,4 +1,4 @@
-# Max attribute value: 273
+# Max attribute value: 274
 # Max object class value: 59
 obj,rhcsCluster,cluster,1
 obj,rhcsCman,cman,3
@@ -331,3 +331,4 @@ attr,rhcsSerial-params,serial_params,271
 attr,rhcsChannel-address,channel_address,272
 obj,rhcsClvmd,clvmd,59
 attr,rhcsInterface,interface,273
+attr,rhcsHash-cluster-id,hash_cluster_id,274
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index fd1eaf7..891eeea 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -117,6 +117,9 @@ To validate your cluster.conf against this schema, run:
      </attribute>
     </optional>
     <optional>
+     <attribute name="hash_cluster_id" rha:description="Enable stronger
hashing of cluster ID to avoid collisions." />
+    </optional>
+    <optional>
      <attribute name="nodename" rha:description="Local node name; this
is set internally by cman-preconfig and should never be set by a user."/>
     </optional>
     <optional>