summaryrefslogtreecommitdiffstats
path: root/ctdb/tests/eventscripts
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-06-18 15:05:39 +1000
committerMartin Schwenke <martin@meltin.net>2013-06-20 13:01:10 +1000
commit2ceed3b0c817b4ed86363c7e0eef94d7cb33a5a2 (patch)
treef1e68ee9d769b827c977957dca770313afe6c88d /ctdb/tests/eventscripts
parent58d499d3aea2ff3331f438aac4543e3906228570 (diff)
downloadsamba-2ceed3b0c817b4ed86363c7e0eef94d7cb33a5a2.tar.gz
samba-2ceed3b0c817b4ed86363c7e0eef94d7cb33a5a2.tar.xz
samba-2ceed3b0c817b4ed86363c7e0eef94d7cb33a5a2.zip
tests/eventscripts: setup_ctdb() should always set $CTDB_PUBLIC_ADDRESSES
Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-programmed-with: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit c3e7a6e10d486ba0dbafdf110db540675b2317bc)
Diffstat (limited to 'ctdb/tests/eventscripts')
-rw-r--r--ctdb/tests/eventscripts/scripts/local.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 6e2f15ce2e0..d8b9307cbe4 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -275,9 +275,10 @@ setup_ctdb ()
export FAKE_CTDB_PNN="${2:-0}"
echo "Setting up CTDB with PNN ${FAKE_CTDB_PNN}"
+ export CTDB_PUBLIC_ADDRESSES="${CTDB_BASE}/public_addresses"
if [ -n "$3" ] ; then
echo "Setting up CTDB_PUBLIC_ADDRESSES: $3"
- export CTDB_PUBLIC_ADDRESSES=$(mktemp)
+ CTDB_PUBLIC_ADDRESSES=$(mktemp)
for _i in $3 ; do
_ip="${_i%@*}"
_ifaces="${_i#*@}"