Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bd…
Commit: bd99e6e4616fddeba7b53333308a57fb327709a8
Parent: 0a06aaf5514112f90446d1dc97ada321de419473
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Fri Mar 26 18:18:19 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue May 11 06:44:37 2010 +0200
cman: use hash_cluster_id by default
This change is not yet suitable for upstream as it breaks minor rolling upgrades.
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/daemon/cman-preconfig.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index ef5964f..2352670 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -50,7 +50,7 @@ static char *mcast_name;
static char *cluster_name;
static char error_reason[1024] = { '\0' };
static hdb_handle_t cluster_parent_handle;
-static int use_hashed_cluster_id = 0;
+static int use_hashed_cluster_id = 1;
/*
* Exports the interface for the service
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1a…
Commit: 1a42df2acb9fd11563129da0a7a6e56d1ebb09fd
Parent: 7dc421cbf11fcec7de9f73266cef70a54a13cb8c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Jan 13 11:25:59 2010 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Tue May 11 06:44:37 2010 +0200
cluster: disable ldap loader support
Product Management Request
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/init.d/cman.in | 27 ---------------------------
cman/man/cman_tool.8 | 4 ++--
config/plugins/Makefile | 2 +-
config/tools/Makefile | 2 +-
config/tools/man/Makefile | 3 +--
config/tools/man/ccs_config_dump.8 | 2 +-
6 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index e0281be..d13d7c0 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -144,11 +144,6 @@ fi
# This can be:
# xmlconfig - read directly from cluster.conf and use ricci as default
# config propagation method. (default)
-# ldapconfig - read configuration from an ldap server.
-# Requires: COROSYNC_LDAP_URL or/and COROSYNC_LDAP_BASEDN
-# envvar to be set.
-# LDAP_BINDDN and LDAP_BINDPWD have to be either both set
-# or both unset.
# corosync_parser - use internal corosync config file parser.
# openaisparser - use internal openais config file parser.
[ -n "$CONFIG_LOADER" ] && cman_join_opts+=" -C $CONFIG_LOADER"
@@ -320,28 +315,6 @@ cman_running()
cman_checkconfig()
{
case "$CONFIG_LOADER" in
- ldapconfig)
- if [ -n "$COROSYNC_LDAP_URL" ] || [ -n "$COROSYNC_LDAP_BASEDN" ]; then
- if [ -n "$COROSYNC_LDAP_BINDDN" ]; then
- if [ -z "$LDAP_BINDPWD" ]; then
- errmsg="ldapconfig has been selected \
- but LDAP_BINDPWD is not set"
- return 1
- fi
- fi
- if [ -n "$LDAP_BINDPWD" ]; then
- if [ -z "$COROSYNC_LDAP_BINDDN" ]; then
- errmsg="ldapconfig has been selected \
- but LDAP_BINDDN is not set"
- return 1
- fi
- fi
- else
- errmsg="ldapconfig has been selected but neither \
- COROSYNC_LDAP_URL or COROSYNC_LDAP_BASEDN have been set"
- return 1
- fi
- ;;
xmlconfig|"")
configfile=@CONFDIR@/@CONFFILE@
[ -n "$COROSYNC_CLUSTER_CONFIG_FILE" ] && \
diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8
index d45e9e9..ce42bd2 100644
--- a/cman/man/cman_tool.8
+++ b/cman/man/cman_tool.8
@@ -281,8 +281,8 @@ have a configuration plugin for it, then you should specify the name of the modu
same as the filename) here.
.br
It is possible to chain configuration modules by separating them with colons. So to
-add two modules (eg) 'ldapconfig' and 'ldappreproc' to the chain start cman with
--C ldapconfig:ldappreproc
+add two modules (eg) 'configloader' and 'configpreproc' to the chain start cman with
+-C configloader:configpreproc
.br
The default value for this is 'xmlconfig'. Note that if the -X is on the command-line
then -C will be ignored.
diff --git a/config/plugins/Makefile b/config/plugins/Makefile
index d39b807..d79ca04 100644
--- a/config/plugins/Makefile
+++ b/config/plugins/Makefile
@@ -1,4 +1,4 @@
include ../../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS = xml ldap
+SUBDIRS = xml
diff --git a/config/tools/Makefile b/config/tools/Makefile
index e695417..e339f3b 100644
--- a/config/tools/Makefile
+++ b/config/tools/Makefile
@@ -1,4 +1,4 @@
include ../../make/defines.mk
include $(OBJDIR)/make/passthrough.mk
-SUBDIRS=ccs_tool ldap xml man
+SUBDIRS=ccs_tool xml man
diff --git a/config/tools/man/Makefile b/config/tools/man/Makefile
index 8674f66..4a5398b 100644
--- a/config/tools/man/Makefile
+++ b/config/tools/man/Makefile
@@ -1,8 +1,7 @@
MANTARGET= \
ccs_config_dump.8 \
ccs_config_validate.8 \
- ccs_tool.8 \
- confdb2ldif.8
+ ccs_tool.8
include ../../../make/defines.mk
include $(OBJDIR)/make/install.mk
diff --git a/config/tools/man/ccs_config_dump.8 b/config/tools/man/ccs_config_dump.8
index e31d3ce..412aebb 100644
--- a/config/tools/man/ccs_config_dump.8
+++ b/config/tools/man/ccs_config_dump.8
@@ -11,7 +11,7 @@ ccs_config_dump \- Tool to generate XML output of running configuration.
\fBccs_config_dump\fP is part of the Cluster Configuration System (CCS).
It is used to dump the current running configuration in XML format.
The running configuration is, sometimes, different from the stored
-configuration on file or ldap because some subsystems store or set
+configuration on file because some subsystems store or set
some default information into the configuration. Those values are
generally not present on the on-disk version of the configuration
but are required at runtime for the cluster to work properly.
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=b1…
Commit: b1d3ffa0a4d86f32d0501eb7a27a80118ad53cb7
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2010-05-11 02:37 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2010-05-11 02:37 +0000
annotated tag: cluster-3.0.12 has been created
at b1d3ffa0a4d86f32d0501eb7a27a80118ad53cb7 (tag)
tagging 7dc421cbf11fcec7de9f73266cef70a54a13cb8c (commit)
replaces cluster-3.0.11
cluster-3.0.12 release
Abhijith Das (3):
gfs2_quota: Keep quota file length always sizeof(struct gfs2_quota) aligned
Merge branch 'STABLE3' of ssh://git.fedoraproject.org/git/cluster into mySTABLE3
gfs2_convert: gfs2_convert doesn't convert quota files
Andrew Beekhof (1):
dlm_controld.pcmk: Prevent use-of-NULL by checking the node has a valid address before adding it to configfs
Christine Caulfield (2):
Make totem.fail_to_recv_const default to 2500
cman: fix name of fail_recv_const
David Teigland (1):
gfs_controld: fix do_leave arg
Jonathan Brassow (1):
HA LVM: Use CLVM with local machine kernel targets (bz 585217)
Lon Hohberger (13):
gfs2: Fix handling of mount points with spaces
resource-agents: Clean up file system agents
rgmanager: Fix resource start/check times
rgmanager: Fix max_restart threshold handling
rgmanager: Fix build warnings
rgmanager: Add per-resource status check tolerances
resource-agents: Add status_program attribute
config: Update config schema
config: Add fail_recv_const
rgmanager: Do hard shut down if corosync dies
rgmanager: Fix man pages
qdiskd: Change votes instead of cman-visible status
qdiskd: Change votes instead of cman-visible status
Steven Whitehouse (1):
Merge branch 'STABLE3' of git://git.fedorahosted.org/cluster into STABLE3