ctdb-tests: Drop no-op functions and add an ip6tables stub

Stub scripts are more obvious.  rc.local should only be used when
strictly necessary.

iptables_wrapper doesn't need to be no-op-ed, provided flock is
installed.

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

diff --git a/ctdb/tests/eventscripts/etc-ctdb/rc.local b/ctdb/tests/eventscripts/etc-ctdb/rc.local
index 0932ab4ad03330c13bd01610140cbd568e9e51fd..3a55e5327b845004183999bbf72c7e3c69f9cdab 100755 (executable)
--- a/ctdb/tests/eventscripts/etc-ctdb/rc.local
+++ b/ctdb/tests/eventscripts/etc-ctdb/rc.local
@@ -52,11 +52,6 @@ get_proc ()
     esac
 }
 
-# Always succeed
-iptables () { : ; }
-ip6tables () { : ; }
-iptables_wrapper () { : ; }
-
 # Do not actually background - we want to see the output
 background_with_logging ()
 {

diff --git a/ctdb/tests/eventscripts/stubs/ip6tables b/ctdb/tests/eventscripts/stubs/ip6tables
new file mode 100755 (executable)
index 0000000..2c65f7b
--- /dev/null
+++ b/ctdb/tests/eventscripts/stubs/ip6tables
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Always succeed.
+
+exit 0