ctdb-scripts: Drop CTDB_NODES configuration option

Tests now deviate from the compile-time default by setting CTDB_BASE.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

9 files changed, 19 insertions, 42 deletions

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.
       </para>
+
       <para>
-        Private addresses are listed in the file specified by the
-        <varname>CTDB_NODES</varname> configuration variable (see
-        <citerefentry><refentrytitle>ctdbd.conf</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry>, default
-        <filename>/usr/local/etc/ctdb/nodes</filename>).  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
+	<filename>/usr/local/etc/ctdb/nodes</filename>).  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.
       </para>
+
+      <para>
+	Some users like to put this configuration file in their
+	cluster filesystem.  A symbolic link should be used in this
+	case.
+      </para>
+
       <para>
 	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
@@ -257,17 +257,6 @@
       </varlistentry>
 
       <varlistentry>
-	<term>CTDB_NODES=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    Default is <varname>CTDB_BASE</varname>/nodes, so usually
-	    <filename>/usr/local/etc/ctdb/nodes</filename>.  Corresponds to
-	    <option>--nlist</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
 	<term>CTDB_NOSETSCHED=yes|no</term>
 	<listitem>
 	  <para>
@@ -311,8 +300,10 @@
 	  </para>
 	  <para>
 	    By default ctdbd will select the first address from the
-	    nodes list that in can bind to.  See also
-	    <citetitle>CTDB_NODES</citetitle>.
+	    nodes list that in can bind to.  See also the
+	    <citetitle>Private address</citetitle> section in
+	    <citerefentry><refentrytitle>ctdb</refentrytitle>
+	    <manvolnum>7</manvolnum></citerefentry>.
 	  </para>
 	  <para>
 	    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 @@
       <listitem>
 	<para>
 	  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
 	  <filename>/usr/local/etc/ctdb/nodes</filename> in the
 	  FILES section for more details.
 	  </para>
@@ -269,14 +268,8 @@
 	    directory.
 	  </para>
 	  <para>
-	    If <envar>CTDB_NODES</envar> is set in configuration then the
-	    file pointed to by <envar>CTDB_NODES</envar> is used.
-	  </para>
-	  <para>
 	    Otherwise the default is
-	    <filename>$CTDB_BASE/nodes</filename>, where
-	    <envar>CTDB_BASE</envar> defaults to
-	    <filename>/usr/local/etc/ctdb</filename>.
+	    <filename>/usr/local/etc/ctdb/nodes</filename>.
           </para>
 	</listitem>
       </varlistentry>
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