Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: a02442e84d4cd139f609de65f7e2e4e6be712f59
Parent: a14288eeded329dd2851d887d169a4b2a5b8cfd0
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Sep 16 12:14:19 2009 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Wed Sep 16 12:14:19 2009 -0400
config: Update LDIF schema
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
config/plugins/ldap/99cluster.ldif | 14 ++++++++++++--
config/plugins/ldap/ldap-base.csv | 6 ++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif
index 38e39ce..0f6925c 100644
--- a/config/plugins/ldap/99cluster.ldif
+++ b/config/plugins/ldap/99cluster.ldif
@@ -1,4 +1,4 @@
-# Auto-generated @ 2009-09-10 13:42:25
+# Auto-generated @ 2009-09-16 12:13:26
dn: cn=schema
attributeTypes: (
1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias'
@@ -1303,6 +1303,12 @@ attributeTypes: (
SINGLE-VALUE
)
attributeTypes: (
+ 1.3.6.1.4.1.2312.8.1.1.240 NAME 'rhcsResource'
+ 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'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
@@ -1566,7 +1572,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 $ 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 )
+ MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsMigration-uri $
rhcsHypervisor-uri $ rhcsHypervisor $ rhcsRestart-expire-time $ rhcsMax-restarts $
rhcsDepend-mode $ rhcsDepend $ rhcsSnapshot $ rhcsPath $ 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
@@ -1585,6 +1591,10 @@ objectClasses: (
MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsDeep-probe-timeout $
rhcsStart-timeout $ rhcsShutdown-timeout $ rhcsSybase-user $ rhcsInterfaces-file $
rhcsLogin-file $ rhcsServer-name $ rhcsSybase-ocs $ rhcsSybase-ase $ rhcsSybase-home $
name $ rhcsRef )
)
objectClasses: (
+ 1.3.6.1.4.1.2312.8.1.2.58 NAME 'rhcsDrbd' SUP top STRUCTURAL
+ MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsResource $ name $
rhcsRef )
+ )
+objectClasses: (
1.3.6.1.4.1.2312.8.1.2.51 NAME 'rhcsFs' SUP top STRUCTURAL
MAY ( rhcs--enforce-timeouts $ rhcs--independent-subtree $ rhcsOptions $
rhcsForce-fsck $ rhcsFsid $ rhcsNfslock $ rhcsSelf-fence $ rhcsQuick-status $
rhcsForce-unmount $ rhcsFstype $ rhcsDevice $ rhcsMountpoint $ name $ rhcsRef )
)
diff --git a/config/plugins/ldap/ldap-base.csv b/config/plugins/ldap/ldap-base.csv
index 9f015b6..33941b7 100644
--- a/config/plugins/ldap/ldap-base.csv
+++ b/config/plugins/ldap/ldap-base.csv
@@ -1,5 +1,5 @@
-# Max attribute value: 239
-# Max object class value: 57
+# Max attribute value: 240
+# Max object class value: 58
obj,rhcsCluster,cluster,1
obj,rhcsCman,cman,3
obj,rhcsTotem,totem,4
@@ -295,3 +295,5 @@ attr,rhcsHypervisor-uri,hypervisor_uri,237
attr,rhcsMigration-uri,migration_uri,238
attr,rhcsSkip-undefined,skip_undefined,239
obj,rhcsLogging-daemon,logging_daemon,57
+obj,rhcsDrbd,drbd,58
+attr,rhcsResource,resource,240