cluster: STABLE3 - config: add cman upgrading and disallowed keys to the schema
Christine Caulfield
chrissie at fedoraproject.org
Fri Oct 2 13:51:00 UTC 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e7f1d826947338a043d781b22b5b0cb67ac82f62
Commit: e7f1d826947338a043d781b22b5b0cb67ac82f62
Parent: b65a7b4e86c4fb6b52752918090ea3230e27970a
Author: Christine Caulfield <ccaulfie at redhat.com>
AuthorDate: Fri Oct 2 14:50:25 2009 +0100
Committer: Christine Caulfield <ccaulfie at redhat.com>
CommitterDate: Fri Oct 2 14:50:25 2009 +0100
config: add cman upgrading and disallowed keys to the schema
Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>
---
config/plugins/ldap/99cluster.ldif | 16 ++++++++++++++--
config/plugins/ldap/ldap-base.csv | 4 +++-
config/tools/xml/cluster.rng.in | 12 ++++++++++++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 0f6925c..6c4ee4b 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2009-09-16 12:13:26
+# Auto-generated @ 2009-10-02 14:49:14
dn: cn=schema
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias'
@@ -25,6 +25,18 @@ attributeTypes: (
SINGLE-VALUE
)
attributeTypes: (
+ 1.3.6.1.4.1.2312.8.1.1.241 NAME 'rhcsUpgrading'
+ 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.242 NAME 'rhcsDisallowed'
+ 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 integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
@@ -1382,7 +1394,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 $ rhcsExpected-votes $ rhcsTwo-node )
+ MAY ( rhcsDisable-openais $ rhcsKeyfile $ rhcsBroadcast $ rhcsNodename $ 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 33941b7..f8a3681 100644
--- a/config/plugins/ldap/ldap-base.csv
+++ b/config/plugins/ldap/ldap-base.csv
@@ -1,4 +1,4 @@
-# Max attribute value: 240
+# Max attribute value: 242
# Max object class value: 58
obj,rhcsCluster,cluster,1
obj,rhcsCman,cman,3
@@ -297,3 +297,5 @@ attr,rhcsSkip-undefined,skip_undefined,239
obj,rhcsLogging-daemon,logging_daemon,57
obj,rhcsDrbd,drbd,58
attr,rhcsResource,resource,240
+attr,rhcsUpgrading,upgrading,241
+attr,rhcsDisallowed,disallowed,242
diff --git a/config/tools/xml/cluster.rng.in b/config/tools/xml/cluster.rng.in
index 871d44e..887c477 100644
--- a/config/tools/xml/cluster.rng.in
+++ b/config/tools/xml/cluster.rng.in
@@ -73,6 +73,18 @@ To validate your cluster.conf against this schema, run:
</attribute>
</optional>
<optional>
+ <attribute name="upgrading" rha:description="Set this if you are
+ performing a rolling upgrade of the cluster between major
+ releases." rha:sample="no"/>
+ </optional>
+ <optional>
+ <attribute name="disallowed" rha:description="Set this to 1 enable
+ cman's Disallowed mode. This is usually only needed for
+ backwards compatibility." rha:sample="1">
+ <data type="nonNegativeInteger"/>
+ </attribute>
+ </optional>
+ <optional>
<attribute name="quorum_dev_poll" rha:description="The amount of time
after a qdisk poll, in milliseconds, before a quorum disk is
considered dead. The quorum disk daemon, qdisk, periodically
More information about the cluster-commits
mailing list