Fix CTDB configuration

Cut down CTDB configuration to bare minimum and move CTDB options from
other sysconfig files (i.e. nfs, vsftp).

Signed-off-by: Martin Schwenke <martin@meltin.net>

4 files changed, 12 insertions, 69 deletions

diff --git a/base/all/root/scripts/cluster_configure/templates/rhel/00.ctdb/1.2.4#/files/etc/sysconfig/ctdb b/base/all/root/scripts/cluster_configure/templates/rhel/00.ctdb/1.2.4#/files/etc/sysconfig/ctdb
index c4cee4a..4a20819 100644
--- a/base/all/root/scripts/cluster_configure/templates/rhel/00.ctdb/1.2.4#/files/etc/sysconfig/ctdb
+++ b/base/all/root/scripts/cluster_configure/templates/rhel/00.ctdb/1.2.4#/files/etc/sysconfig/ctdb
@@ -1,69 +1,19 @@
-# Options to ctdbd. This is read by /etc/init.d/ctdb
-
-# should ctdb do IP takeover? If it should, then specify a file
-# containing the list of public IP addresses that ctdb will manage
-# Note that these IPs must be different from those in $NODES above
-# there is no default
+# Core 
 CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
-# when doing IP takeover you also must specify what network interface
-# to use for the public addresses
-# there is no default
-CTDB_PUBLIC_INTERFACE=eth0
-# should ctdb manage starting/stopping the Samba service for you?
-# default is to not manage Samba
+CTDB_RECOVERY_LOCK=@@GPFS_DEFAULT_MOUNTPOINT@@/.ctdb/recovery.lock
+
+# Services managed
 CTDB_MANAGES_SAMBA=yes
-# should ctdb manage starting/stopping Winbind service?
-# if left comented out then it will be autodetected based on smb.conf
 CTDB_MANAGES_WINBIND=!!|"yes" if self.config.get("package:ctdb", "auth_method") == "winbind" else "no"!!
-# should ctdb monitor GPFS filesystems and disks
-CTDB_MANAGES_GPFS=yes
-# you may wish to raise the file descriptor limit for ctdb
-# use a ulimit command here. ctdb needs one file descriptor per
-# connected client (ie. one per connected client in Samba)
+CTDB_MANAGES_NFS=yes
+CTDB_MANAGES_HTTPD=yes
+CTDB_MANAGES_VSFTPD=yes
+
+# System
 ulimit -n 1048576
 DAEMON_COREFILE_LIMIT="unlimited"
-# the NODES file must be specified or ctdb won't start
-# it should contain a list of IPs that ctdb will use
-# it must be exactly the same on all cluster nodes
-# defaults to /etc/ctdb/nodes
-CTDB_NODES=/etc/ctdb/nodes
-# the directory to put the local ctdb database files in
-# defaults to /var/ctdb
-CTDB_DBDIR=/var/ctdb
-# the script to run when ctdb needs to ask the OS for help,
-# such as when a IP address needs to be taken or released
-# defaults to /etc/ctdb/events
-CTDB_EVENT_SCRIPT=/etc/ctdb/events.d
-# the location of the local ctdb socket
-# defaults to /tmp/ctdb.socket
-CTDB_SOCKET=/tmp/ctdb.socket
-# what transport to use. Only tcp is currently supported
-# defaults to tcp
-CTDB_TRANSPORT="tcp"
-# where to log messages
-# the default is /var/log/log.ctdb
-CTDB_LOGFILE=/var/log/log.ctdb
-# what debug level to run at. Higher means more verbose
-# the default is 2
-CTDB_DEBUGLEVEL=NOTICE
-# set any default tuning options for ctdb
-# use CTDB_SET_XXXX=value where XXXX is the name of the tuning
-# variable
-# for example
-#CTDB_SET_TRAVERSETIMEOUT=60
-#Disable the share check during monitor
-CTDB_SAMBA_SKIP_SHARE_CHECK=yes
-CTDB_NFS_SKIP_SHARE_CHECK=yes
-#Specify the SMB ports to check during monitor
-CTDB_SAMBA_CHECK_PORTS="445"
-# you can get a list of variables using "ctdb listvars"
-# any other options you might want. Run ctdbd --help for a list
-CTDB_SYSLOG="yes"
 
-# The in-memory ringbuffer used for first-time capture of log data in ctdb
+# Logging
+CTDB_SYSLOG="yes"
+CTDB_DEBUGLEVEL=NOTICE
 CTDB_LOG_RINGBUF_SIZE=500000
-# This avoids ctdbd from logging errors when knfsd has hung and avoids this
-# from making the node unhealthy.
-CTDB_NFS_SKIP_KNFSD_ALIVE_CHECK="yes"
-CTDB_SET_DeterministicIPs=!!deterministic_ips!!
-NFS_SERVER_MODE=KERNEL
diff --git a/base/all/root/scripts/cluster_configure/templates/rhel/40.vsftpd/2.0#/files/etc/sysconfig/vsftpd b/base/all/root/scripts/cluster_configure/templates/rhel/40.vsftpd/2.0#/files/etc/sysconfig/vsftpd
index 75ff073..38e33a1 100644
--- a/base/all/root/scripts/cluster_configure/templates/rhel/40.vsftpd/2.0#/files/etc/sysconfig/vsftpd
+++ b/base/all/root/scripts/cluster_configure/templates/rhel/40.vsftpd/2.0#/files/etc/sysconfig/vsftpd
@@ -1,2 +1 @@
-CTDB_MANAGES_VSFTPD=yes
 FTP_EXPORTS='!!%export:format("%s:%s ", ["name", "directory"])!!'
diff --git a/base/all/root/scripts/cluster_configure/templates/rhel/41.httpd/2.2#/files/etc/sysconfig/http b/base/all/root/scripts/cluster_configure/templates/rhel/41.httpd/2.2#/files/etc/sysconfig/http
deleted file mode 100644
index 5b62e44..0000000
--- a/base/all/root/scripts/cluster_configure/templates/rhel/41.httpd/2.2#/files/etc/sysconfig/http
+++ /dev/null
@@ -1,3 +0,0 @@
-# should ctdb manage starting/stopping the service for you?
-# default is to not manage it
-CTDB_MANAGES_HTTPD=yes
\ No newline at end of file
diff --git a/base/all/root/scripts/cluster_configure/templates/rhel/60.nfs-utils/1.0#/files/etc/sysconfig/nfs b/base/all/root/scripts/cluster_configure/templates/rhel/60.nfs-utils/1.0#/files/etc/sysconfig/nfs
index cd42ff8..dce3ce7 100644
--- a/base/all/root/scripts/cluster_configure/templates/rhel/60.nfs-utils/1.0#/files/etc/sysconfig/nfs
+++ b/base/all/root/scripts/cluster_configure/templates/rhel/60.nfs-utils/1.0#/files/etc/sysconfig/nfs
@@ -7,6 +7,3 @@ LOCKD_TCPPORT=32769
 NFS_HOSTNAME="!!nfs_hostname!!"
 STATD_HOSTNAME="$NFS_HOSTNAME -H /etc/ctdb/statd-callout "
 RPCNFSDARGS="-N 4"
-# should ctdb manage starting/stopping the service for you?
-# default is to not manage it
-CTDB_MANAGES_NFS=yes