With some upcoming changes, the setting of CTDB_BASE becomes
problematic because it will be included unconditionally whereas it is
currently being conveniently and almost accidentally not include in
some contexts.
So, instead of trying to coerce onnode into behaving as desired, have
the local daemons tests use local_daemons.sh onnode directly.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb_local_daemons="${helper} ${SIMPLE_TESTS_VAR_DIR}"
-# onnode will execute this, which fakes ssh against local daemons
-export ONNODE_SSH="${ctdb_local_daemons} ssh"
-
#######################################
setup_ctdb ()
start_ctdb_1 "$1"
}
-# onnode just needs the nodes file, so use the common one
-export CTDB_BASE="$SIMPLE_TESTS_VAR_DIR"
+onnode ()
+{
+ $ctdb_local_daemons onnode "$@"
+}