ctdb-scripts: Move monitoring of CTDB_NATGW_PUBLIC_IFACE to 11.natgw

The NAT gateway code should be self-contained. Signed-off-by: Martin Schwenke <[email protected]> Reviewed-by: Amitay Isaacs <[email protected]>
gabrielmansi · Jan 25, 2016 · 638117c · 638117c
1 parent df5845c
commit 638117c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
@@ -30,7 +30,6 @@ get_all_interfaces ()
 
     # Add some special interfaces if they're defined
     [ "$CTDB_PUBLIC_INTERFACE" ] && all_interfaces="$CTDB_PUBLIC_INTERFACE $all_interfaces"
-    [ "$CTDB_NATGW_PUBLIC_IFACE" ] && all_interfaces="$CTDB_NATGW_PUBLIC_IFACE $all_interfaces"
 
     # Get the interfaces for which CTDB has public IPs configured.
     # That is, for all but the 1st line, get the 1st field.

diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
@@ -239,6 +239,14 @@ case "$1" in
 	natgw_clear
 	;;
 
+    monitor)
+	natgw_check_config
+
+	if [ -n "$CTDB_NATGW_PUBLIC_IFACE" ] ; then
+	    interface_monitor "$CTDB_NATGW_PUBLIC_IFACE" || exit 1
+	fi
+	;;
+
     *)
 	ctdb_standard_event_handler "@"
 	;;