diff options
author | Martin Schwenke <martin@meltin.net> | 2018-03-14 15:30:37 +1100 |
---|---|---|
committer | Amitay Isaacs <amitay@samba.org> | 2018-03-19 02:23:20 +0100 |
commit | 6cf861a544e19b6b9df839d470e49baafff1097d (patch) | |
tree | 087321cbbdd41f5820e39f0e324df5528ee98eda /ctdb/config | |
parent | a1eac09dd36ef5d5f3f861cfb37d96f86eebe5ed (diff) | |
download | samba-6cf861a544e19b6b9df839d470e49baafff1097d.tar.gz |
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>
Diffstat (limited to 'ctdb/config')
-rw-r--r-- | ctdb/config/ctdbd.conf | 3 | ||||
-rwxr-xr-x | ctdb/config/ctdbd_wrapper | 1 |
2 files changed, 0 insertions, 4 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" |