ctdb-tests: New function setup_numnodes()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 098b305034be68fc7f20cebea650c50e46f33700..73a77dce74682731063836ad56cac3d99fde45fe 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -296,6 +296,12 @@ eventscript_call ()
     )
 }
 
+setup_numnodes ()
+{
+       export FAKE_CTDB_NUMNODES="${1:-3}"
+       echo "Setting up CTDB with ${FAKE_CTDB_NUMNODES} fake nodes"
+}
+
 # For now this creates the same public addresses each time.  However,
 # it could be made more flexible.
 setup_public_addresses ()
@@ -314,6 +320,9 @@ setup_public_addresses ()
 10.0.1.2/24 dev456
 10.0.1.3/24 dev456
 EOF
+
+    # Needed for IP allocation
+    setup_numnodes
 }
 
 # Need to cope with ctdb_get_pnn().  If a test changes PNN then it
@@ -332,9 +341,6 @@ setup_ctdb ()
 {
     setup_generic
 
-    export FAKE_CTDB_NUMNODES="${1:-3}"
-    echo "Setting up CTDB with ${FAKE_CTDB_NUMNODES} fake nodes"
-
     ctdb_set_pnn "${2:-0}"
 
     setup_public_addresses