diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-02-27 15:20:56 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-03-04 10:42:27 +0100 |
| commit | d98c7ba382189161c5b8cbbebbdfbe36f1456572 (patch) | |
| tree | 31cb6aa65205196069d7ab317a0861784b7c319d /ctdb | |
| parent | 7e7c24ca7a422f2258962216b0184eda8d49827f (diff) | |
| download | samba-d98c7ba382189161c5b8cbbebbdfbe36f1456572.tar.gz samba-d98c7ba382189161c5b8cbbebbdfbe36f1456572.tar.xz samba-d98c7ba382189161c5b8cbbebbdfbe36f1456572.zip | |
ctdb-tests: Make setup of public addresses more obvious
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index c3cd6a071d..163a8fb3ac 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -276,6 +276,33 @@ ctdb_set_output () eventscripts_test_add_cleanup "rm -f $_out $_rc" } +# For now this creates the same public addresses each time. However, +# it could be made more flexible. +setup_public_addresses () +{ + if [ -f "$CTDB_PUBLIC_ADDRESSES" -a \ + "${CTDB_PUBLIC_ADDRESSES%/*}" = "$EVENTSCRIPTS_TESTS_VAR_DIR" ] ; then + rm "$CTDB_PUBLIC_ADDRESSES" + fi + + export CTDB_PUBLIC_ADDRESSES=$(mktemp \ + --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR" \ + "public-addresses-XXXXXXXX") + + echo "Setting up CTDB_PUBLIC_ADDRESSES=${CTDB_PUBLIC_ADDRESSES}" + cat >"$CTDB_PUBLIC_ADDRESSES" <<EOF +10.0.0.1/24 dev123 +10.0.0.2/24 dev123 +10.0.0.3/24 dev123 +10.0.0.4/24 dev123 +10.0.0.5/24 dev123 +10.0.0.6/24 dev123 +10.0.1.1/24 dev456 +10.0.1.2/24 dev456 +10.0.1.3/24 dev456 +EOF +} + setup_ctdb () { setup_generic @@ -286,17 +313,7 @@ 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" - CTDB_PUBLIC_ADDRESSES=$(mktemp) - for _i in $3 ; do - _ip="${_i%@*}" - _ifaces="${_i#*@}" - echo "${_ip} ${_ifaces}" >>"$CTDB_PUBLIC_ADDRESSES" - done - eventscripts_test_add_cleanup "rm -f $CTDB_PUBLIC_ADDRESSES" - fi + setup_public_addresses export FAKE_CTDB_STATE="$EVENTSCRIPTS_TESTS_VAR_DIR/fake-ctdb" |