From: Martin Schwenke <martin@meltin.net>
Date: Wed, 20 Apr 2016 10:17:04 +0000 (+1000)
Subject: ctdb-ipalloc: Do ipreallocated even if no IP addresses can be allocated
X-Git-Tag: talloc-2.1.7~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09173f80d9924fab2fff185557f57eebdcf07745;p=thirdparty%2Fsamba.git

ctdb-ipalloc: Do ipreallocated even if no IP addresses can be allocated

In particular, LVS won't work at all if there are no public IP
addresses.

This is a temporary solution until a generic reconfiguration hook is
implemented.

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

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 0caf55bff33..5001489ef18 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1731,7 +1731,7 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodem
 	}
 	if (!can_host_ips) {
 		DEBUG(DEBUG_WARNING,("No nodes available to host public IPs yet\n"));
-		return 0;
+		goto ipreallocated;
 	}
 
 	/* since nodes only know about those public addresses that