From: Martin Schwenke <martin@meltin.net>
Date: Thu, 8 Mar 2018 04:32:52 +0000 (+1100)
Subject: ctdb-daemon: Drop ctdbd --public-addresses option
X-Git-Tag: talloc-2.1.12~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482ff4bdd3712ce5ac6423aa9509c364eff5db7a;p=thirdparty%2Fsamba.git

ctdb-daemon: Drop ctdbd --public-addresses option

Use the default location.

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

diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index ac1d22c74f3..a72eb9bcea7 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -298,27 +298,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>--public-addresses=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    FILENAME specifying a file containing the public IP
-	    addresses to use on the cluster when CTDB should use IP
-	    takeover. This file contains a list of IP addresses,
-	    netmasks and interfaces.  CTDB will distribute these public
-	    IP addresses appropriately across the available nodes.
-	  </para>
-	  <para>
-	    The IP addresses specified in this file can differ across
-	    nodes.
-	  </para>
-	  <para>
-	    Default is
-	    <filename>/usr/local/etc/ctdb/public_addresses</filename>
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>--public-interface=<parameter>INTERFACE</parameter></term>
 	<listitem>
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 63986b0388b..cca08f9e7c6 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -44,7 +44,6 @@ static struct {
 	const char *nlist;
 	const char *transport;
 	const char *myaddress;
-	const char *public_address_list;
 	const char *notification_script;
 	const char *logging;
 	const char *recovery_lock;
@@ -65,7 +64,6 @@ static struct {
 } options = {
 	.debuglevel = "NOTICE",
 	.nlist = NULL,
-	.public_address_list = NULL,
 	.transport = "tcp",
 	.logging = "file:" LOGDIR "/log.ctdb",
 	.db_dir = CTDB_VARDIR,
@@ -119,7 +117,6 @@ int main(int argc, const char *argv[])
 		POPT_AUTOHELP
 		{ "debug", 'd', POPT_ARG_STRING, &options.debuglevel, 0, "debug level", NULL },
 		{ "interactive", 'i', POPT_ARG_NONE, &interactive, 0, "don't fork", NULL },
-		{ "public-addresses", 0, POPT_ARG_STRING, &options.public_address_list, 0, "public address list file", "filename" },
 		{ "public-interface", 0, POPT_ARG_STRING, &options.public_interface, 0, "public interface", "interface"},
 		{ "logging", 0, POPT_ARG_STRING, &options.logging, 0, "logging method to be used", NULL },
 		{ "nlist", 0, POPT_ARG_STRING, &options.nlist, 0, "node list file", "filename" },
@@ -338,7 +335,6 @@ int main(int argc, const char *argv[])
 		ctdb->do_setsched = false;
 	}
 
-	ctdb->public_addresses_file = options.public_address_list;
 	ctdb->do_checkpublicip = (options.no_publicipcheck == 0);
 
 	if (options.max_persistent_check_errors < 0) {