From: Martin Schwenke <martin@meltin.net>
Date: Tue, 20 Feb 2018 07:58:48 +0000 (+1100)
Subject: ctdb-scripts: Drop CTDB_PUBLIC_INTERFACE configuration option
X-Git-Tag: talloc-2.1.12~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1fcb0a129fa75d8f51a4fe0b6f29bcdc4467707;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop CTDB_PUBLIC_INTERFACE configuration option

The interface must always be specified in the public addresses file.

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

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index d65d53c78fa..48aad782bd9 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -95,7 +95,6 @@ build_ctdb_options ()
     maybe_set "--logging"                "$CTDB_LOGGING"
     maybe_set "--nlist"                  "$CTDB_NODES"
     maybe_set "--listen"                 "$CTDB_NODE_ADDRESS"
-    maybe_set "--public-interface"       "$CTDB_PUBLIC_INTERFACE"
     maybe_set "--dbdir"                  "$CTDB_DBDIR"
     maybe_set "--dbdir-persistent"       "$CTDB_DBDIR_PERSISTENT"
     maybe_set "--dbdir-state"            "$CTDB_DBDIR_STATE"
diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 7093470e8ea..f05559b22ae 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -29,9 +29,6 @@ get_all_interfaces ()
 			 -e "s/,/ /g" \
 			 -e "s/[\t ]*$//" "$ctdb_public_addresses")
 
-    # Add some special interfaces if they're defined
-    [ "$CTDB_PUBLIC_INTERFACE" ] && all_interfaces="$CTDB_PUBLIC_INTERFACE $all_interfaces"
-
     # Get the interfaces for which CTDB has public IPs configured.
     # That is, for all but the 1st line, get the 1st field.
     ctdb_ifaces=$($CTDB -X ifaces | sed -e '1d' -e 's@^|@@' -e 's@|.*@@')
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 4fe01ef6de3..652bb31bdea 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -325,16 +325,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>CTDB_PUBLIC_INTERFACE=<parameter>INTERFACE</parameter></term>
-	<listitem>
-	  <para>
-	    No default.  Corresponds to
-	    <option>--public-interface</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_RECOVERY_LOCK=<parameter>LOCK</parameter></term>
 	<listitem>
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.007.sh b/ctdb/tests/eventscripts/10.interface.monitor.007.sh
deleted file mode 100755
index c45900e3b2e..00000000000
--- a/ctdb/tests/eventscripts/10.interface.monitor.007.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "unknown interface, up"
-
-setup_ctdb
-
-export CTDB_PUBLIC_INTERFACE="dev999"
-
-ok_null
-
-simple_test
diff --git a/ctdb/tests/eventscripts/10.interface.monitor.008.sh b/ctdb/tests/eventscripts/10.interface.monitor.008.sh
deleted file mode 100755
index 8ab84f801c8..00000000000
--- a/ctdb/tests/eventscripts/10.interface.monitor.008.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. "${TEST_SCRIPTS_DIR}/unit.sh"
-
-define_test "unknown interface, down, up"
-
-setup_ctdb
-
-iface="dev999"
-export CTDB_PUBLIC_INTERFACE="$iface"
-
-ethtool_interfaces_down "$iface"
-required_result 1 "ERROR: No link on the public network interface $iface"
-simple_test
-
-ethtool_interfaces_up "$iface"
-ok_null
-simple_test
-
-ok_null
-simple_test