ctdb-tests: Use onnode to start/stop local daemons

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

diff --git a/ctdb/tests/simple/scripts/local_daemons.bash b/ctdb/tests/simple/scripts/local_daemons.bash
index aad533b969b189f21435ddb0c8f87689bd61df73..1858492bcd5d83c2900a8781e46b7e7deb6e28e3 100644 (file)
--- a/ctdb/tests/simple/scripts/local_daemons.bash
+++ b/ctdb/tests/simple/scripts/local_daemons.bash
@@ -192,17 +192,9 @@ EOF
 start_ctdb_1 ()
 {
        local pnn="$1"
-       local node_dir=$(node_dir "$pnn")
-       local pidfile=$(node_pidfile "$pnn")
-       local conf=$(node_conf "$pnn")
-       local socket=$(node_socket "$pnn")
 
        CTDBD="${VALGRIND} ctdbd --sloppy-start --nopublicipcheck" \
-            CTDB_BASE="$node_dir" \
-            CTDBD_CONF="$conf" \
-            CTDB_PIDFILE="$pidfile" \
-            CTDB_SOCKET="$socket" \
-            ctdbd_wrapper start
+            onnode "$pnn" ctdbd_wrapper start
 }
 
 daemons_start ()
@@ -218,16 +210,8 @@ daemons_start ()
 stop_ctdb_1 ()
 {
        local pnn="$1"
-       local node_dir=$(node_dir "$pnn")
-       local pidfile=$(node_pidfile "$pnn")
-       local conf=$(node_conf "$pnn")
-       local socket=$(node_socket "$pnn")
-
-       CTDB_BASE="$node_dir" \
-                CTDBD_CONF="$conf" \
-                CTDB_PIDFILE="$pidfile" \
-                CTDB_SOCKET="$socket" \
-                ctdbd_wrapper stop
+
+       onnode "$pnn" ctdbd_wrapper stop
 }
 
 daemons_stop ()