summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2015-04-20 09:53:23 +1000
committerAmitay Isaacs <amitay@samba.org>2015-04-27 06:10:08 +0200
commit0621f07eb482daf7495f6314b0af32853573cb82 (patch)
tree465732bf3fc8c167c572f0f6cd8de3c07f75cdaa
parentb38137a3898afc86348404af4435beb44d3493be (diff)
downloadsamba-0621f07eb482daf7495f6314b0af32853573cb82.tar.gz
ctdb-scripts: New configuration variable CTDB_NODE_ADDRESS
Required when automatic address detection can not be used. This can be the case when running multiple ctdbd daemons/nodes on the same physical host (usually for testing), using InfiniBand for the private network or on Linux when sysctl net.ipv4.ip_nonlocal_bind=1. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Mon Apr 27 06:10:08 CEST 2015 on sn-devel-104
-rwxr-xr-xctdb/config/ctdbd_wrapper1
-rw-r--r--ctdb/doc/ctdbd.conf.5.xml23
2 files changed, 24 insertions, 0 deletions
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index f50efe90ac3..aac83696917 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -114,6 +114,7 @@ build_ctdb_options ()
maybe_set "--logging" "$CTDB_LOGGING"
maybe_set "--nlist" "$CTDB_NODES"
maybe_set "--socket" "$CTDB_SOCKET"
+ maybe_set "--listen" "$CTDB_NODE_ADDRESS"
maybe_set "--public-addresses" "$CTDB_PUBLIC_ADDRESSES"
maybe_set "--public-interface" "$CTDB_PUBLIC_INTERFACE"
maybe_set "--dbdir" "$CTDB_DBDIR"
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 8a62c86615b..cc56d790988 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -344,6 +344,29 @@
</varlistentry>
<varlistentry>
+ <term>CTDB_NODE_ADDRESS=<parameter>FILENAME</parameter></term>
+ <listitem>
+ <para>
+ IPADDR is the private IP address that ctdbd will bind to.
+ Corresponds to <option>--listen</option>.
+ </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>.
+ </para>
+ <para>
+ This option is only required when automatic address
+ detection can not be used. This can be the case when
+ running multiple ctdbd daemons/nodes on the same physical
+ host (usually for testing), using InfiniBand for the
+ private network or on Linux when sysctl
+ net.ipv4.ip_nonlocal_bind=1.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>CTDB_PUBLIC_ADDRESSES=<parameter>FILENAME</parameter></term>
<listitem>
<para>