summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2012-12-03 15:32:49 +1100
committerAmitay Isaacs <amitay@gmail.com>2013-01-07 10:35:39 +1100
commit5cf98c80ff7bc3814e5a052bd21ee51172dcb02c (patch)
treec032ba10850dad215d7368a3dac48d348a252f7b
parentdf7152fe8732df988f262f19c2d47729f6bfd733 (diff)
downloadsamba-5cf98c80ff7bc3814e5a052bd21ee51172dcb02c.tar.gz
samba-5cf98c80ff7bc3814e5a052bd21ee51172dcb02c.tar.xz
samba-5cf98c80ff7bc3814e5a052bd21ee51172dcb02c.zip
tests: Local daemons should use --listen instead of --node-ip
Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-programmed-with: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit 3221fce9ee2f6fdd3bb17a5e1629ad52a32f90d6)
-rw-r--r--ctdb/tests/scripts/integration.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash
index 38420bacee..8813499856 100644
--- a/ctdb/tests/scripts/integration.bash
+++ b/ctdb/tests/scripts/integration.bash
@@ -575,7 +575,7 @@ daemons_start_1 ()
fi
local node_ip=$(sed -n -e "$(($pnn + 1))p" "$CTDB_NODES")
- local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --node-ip=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --log-ringbuf-size=10000 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state"
+ local ctdb_options="--reclock=${TEST_VAR_DIR}/rec.lock --nlist $CTDB_NODES --nopublicipcheck --listen=${node_ip} --event-script-dir=${TEST_VAR_DIR}/events.d --logfile=${TEST_VAR_DIR}/daemon.${pnn}.log -d 3 --log-ringbuf-size=10000 --dbdir=${TEST_VAR_DIR}/test.db --dbdir-persistent=${TEST_VAR_DIR}/test.db/persistent --dbdir-state=${TEST_VAR_DIR}/test.db/state"
if [ -n "$TEST_LOCAL_DAEMONS" ] ; then
ctdb_options="$ctdb_options --public-interface=lo"