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)

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 6e2f15ce2e087027287a109b14832b00fe81d872..d8b9307cbe46c9f7be83067d404e0b79939380f8 100644 (file)
--- 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#*@}"