ctdb-scripts: Drop all public IP addresses from 10.interface

00.ctdb should not know about public IP addresses.

Move related tests to operate on 10.interface.

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

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 5e8af4cbede3ca02c5f19e59003aaf8895c44aa6..21ca77be1ff35b2521060de143d405140c1cd790 100755 (executable)
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -172,10 +172,6 @@ case "$1" in
            exit $ret
        }
 
-       # make sure we drop any ips that might still be held if
-       # previous instance of ctdb got killed with -9 or similar
-       drop_all_public_ips
-
        if select_tdb_checker ; then
            check_persistent_databases || exit $?
            check_non_persistent_databases

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 51d1b974dcf29032d81c35c766d78305ddaefab4..69da2106b3909efc9c27350b5bf74925276045b3 100755 (executable)
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -180,6 +180,10 @@ case "$1" in
        _promote="sys/net/ipv4/conf/all/promote_secondaries"
        get_proc "$_promote" >/dev/null 2>&1 || \
            die "Public IPs only supported if promote_secondaries is available"
+
+       # make sure we drop any ips that might still be held if
+       # previous instance of ctdb got killed with -9 or similar
+       drop_all_public_ips
        ;;
 
      #############################

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.021.sh b/ctdb/tests/eventscripts/10.interface.init.021.sh
similarity index 100%
rename from ctdb/tests/eventscripts/00.ctdb.init.021.sh
rename to ctdb/tests/eventscripts/10.interface.init.021.sh

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.022.sh b/ctdb/tests/eventscripts/10.interface.init.022.sh
similarity index 100%
rename from ctdb/tests/eventscripts/00.ctdb.init.022.sh
rename to ctdb/tests/eventscripts/10.interface.init.022.sh

diff --git a/ctdb/tests/eventscripts/00.ctdb.init.023.sh b/ctdb/tests/eventscripts/10.interface.init.023.sh
similarity index 100%
rename from ctdb/tests/eventscripts/00.ctdb.init.023.sh
rename to ctdb/tests/eventscripts/10.interface.init.023.sh