From 6cf861a544e19b6b9df839d470e49baafff1097d Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 14 Mar 2018 15:30:37 +1100 Subject: ctdb-scripts: Drop CTDB_NODES configuration option Tests now deviate from the compile-time default by setting CTDB_BASE. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/ctdbd.conf | 3 --- ctdb/config/ctdbd_wrapper | 1 - ctdb/doc/ctdb.7.xml | 21 +++++++++++++-------- ctdb/doc/ctdbd.conf.5.xml | 17 ++++------------- ctdb/doc/examples/cluster.conf | 2 -- ctdb/doc/examples/lvs.conf | 2 -- ctdb/doc/examples/natgw.conf | 2 -- ctdb/doc/onnode.1.xml | 11 ++--------- ctdb/tools/onnode | 2 -- 9 files changed, 19 insertions(+), 42 deletions(-) (limited to 'ctdb') diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf index f8c56d078bb..2399a8ec97a 100644 --- a/ctdb/config/ctdbd.conf +++ b/ctdb/config/ctdbd.conf @@ -8,9 +8,6 @@ # what you are doing. # CTDB_RECOVERY_LOCK=/some/place/on/shared/storage -# List of nodes in the cluster. Default is below. -# CTDB_NODES=/etc/ctdb/nodes - # What services should CTDB manage? Default is none. # CTDB_MANAGES_SAMBA=yes # CTDB_MANAGES_WINBIND=yes diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper index 48aad782bd9..c239e3d4a3b 100755 --- a/ctdb/config/ctdbd_wrapper +++ b/ctdb/config/ctdbd_wrapper @@ -93,7 +93,6 @@ build_ctdb_options () # build up ctdb_options variable from optional parameters maybe_set "--logging" "$CTDB_LOGGING" - maybe_set "--nlist" "$CTDB_NODES" maybe_set "--listen" "$CTDB_NODE_ADDRESS" maybe_set "--dbdir" "$CTDB_DBDIR" maybe_set "--dbdir-persistent" "$CTDB_DBDIR_PERSISTENT" diff --git a/ctdb/doc/ctdb.7.xml b/ctdb/doc/ctdb.7.xml index c07af61dbf6..079b34d8a08 100644 --- a/ctdb/doc/ctdb.7.xml +++ b/ctdb/doc/ctdb.7.xml @@ -174,16 +174,21 @@ the cluster and is the address that CTDB daemons will use to communicate with the CTDB daemons on other nodes. + - Private addresses are listed in the file specified by the - CTDB_NODES configuration variable (see - ctdbd.conf - 5, default - /usr/local/etc/ctdb/nodes). This file contains the - list of private addresses for all nodes in the cluster, one - per line. This file must be the same on all nodes in the - cluster. + Private addresses are listed in the file + /usr/local/etc/ctdb/nodes). This file + contains the list of private addresses for all nodes in the + cluster, one per line. This file must be the same on all nodes + in the cluster. + + + Some users like to put this configuration file in their + cluster filesystem. A symbolic link should be used in this + case. + + Private addresses should not be used by clients to connect to services provided by the cluster. diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml index 652bb31bdea..ee9cec84759 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -256,17 +256,6 @@ - - CTDB_NODES=FILENAME - - - Default is CTDB_BASE/nodes, so usually - /usr/local/etc/ctdb/nodes. Corresponds to - . - - - - CTDB_NOSETSCHED=yes|no @@ -311,8 +300,10 @@ By default ctdbd will select the first address from the - nodes list that in can bind to. See also - CTDB_NODES. + nodes list that in can bind to. See also the + Private address section in + ctdb + 7. This option is only required when automatic address diff --git a/ctdb/doc/examples/cluster.conf b/ctdb/doc/examples/cluster.conf index b3a3263efdb..2ad9b2b08e3 100644 --- a/ctdb/doc/examples/cluster.conf +++ b/ctdb/doc/examples/cluster.conf @@ -51,8 +51,6 @@ CTDB_RECOVERY_LOCK=/shared/recovery.lock # 192.168.1.3 # ---------- /etc/ctdb/nodes ---------- # -CTDB_NODES=/etc/ctdb/nodes - # # Public addresses configuration # diff --git a/ctdb/doc/examples/lvs.conf b/ctdb/doc/examples/lvs.conf index 81888b396ec..e9ade9d5db1 100644 --- a/ctdb/doc/examples/lvs.conf +++ b/ctdb/doc/examples/lvs.conf @@ -50,8 +50,6 @@ CTDB_RECOVERY_LOCK=/shared/recovery.lock # 192.168.1.3 # ---------- /etc/ctdb/nodes ---------- # -CTDB_NODES=/etc/ctdb/nodes - # Enable logging to syslog CTDB_LOGGING=syslog diff --git a/ctdb/doc/examples/natgw.conf b/ctdb/doc/examples/natgw.conf index e1844d63b97..5fbb2d16fd4 100644 --- a/ctdb/doc/examples/natgw.conf +++ b/ctdb/doc/examples/natgw.conf @@ -53,8 +53,6 @@ CTDB_RECOVERY_LOCK=/shared/recovery.lock # 192.168.1.3 # ---------- /etc/ctdb/nodes ---------- # -CTDB_NODES=/etc/ctdb/nodes - # # Public addresses configuration # diff --git a/ctdb/doc/onnode.1.xml b/ctdb/doc/onnode.1.xml index a73230e87de..7c45563bd47 100644 --- a/ctdb/doc/onnode.1.xml +++ b/ctdb/doc/onnode.1.xml @@ -60,8 +60,7 @@ Specify an alternative nodes FILENAME to use instead of - the default. This option overrides the CTDB_NODES - variable. See the discussion of + the default. See the discussion of /usr/local/etc/ctdb/nodes in the FILES section for more details. @@ -268,15 +267,9 @@ also searched for in the $CTDB_BASE directory. - - If CTDB_NODES is set in configuration then the - file pointed to by CTDB_NODES is used. - Otherwise the default is - $CTDB_BASE/nodes, where - CTDB_BASE defaults to - /usr/local/etc/ctdb. + /usr/local/etc/ctdb/nodes. diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index 25237601268..6f1b732705c 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -228,8 +228,6 @@ get_nodes () # $f is relative, try in $CTDB_BASE f="${CTDB_BASE}/${f}" fi - elif [ -n "$CTDB_NODES" ] ; then - f="$CTDB_NODES" fi if [ ! -r "$f" ] ; then -- cgit v1.2.1