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

(Imported from commit 0621f07eb482daf7495f6314b0af32853573cb82)

diff --git a/config/ctdbd_wrapper b/config/ctdbd_wrapper
index c6209844279fec76a75030247756c0970f0145e3..71eddaf2f189bf54534371e451a913ed8795cb1a 100644 (file)
--- a/config/ctdbd_wrapper
+++ b/config/ctdbd_wrapper
@@ -147,6 +147,7 @@ build_ctdb_options ()
     maybe_set "--logfile"                "$CTDB_LOGFILE"
     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/doc/ctdbd.conf.5.xml b/doc/ctdbd.conf.5.xml
index d73a2ab1917a684ada82e50baf83967030016405..de8502ef1e80438a45cf911ac8ff302ff0e94a5b 100644 (file)
--- a/doc/ctdbd.conf.5.xml
+++ b/doc/ctdbd.conf.5.xml
@@ -295,6 +295,29 @@
        </listitem>
       </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>