From: Stephen Shirley <diamond@google.com>
Date: Tue, 15 Feb 2011 14:29:03 +0000 (+0100)
Subject: Don't remove master_candidate flag from merged nodes
X-Git-Tag: v2.4.0rc2~1^2~9
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/98632c4f0edc3246c8f11ed2ce1421c985a87d9b

Don't remove master_candidate flag from merged nodes

Prevents lots of spurious warnings like:
2011-02-10 17:00:22,776: CRITICAL Configuration data is not consistent:
Not enough master candidates: actual 3, target 4

Signed-off-by: Stephen Shirley <diamond@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---

diff --git a/tools/cluster-merge b/tools/cluster-merge
index 52ecfc2..d2e8c1f 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -273,7 +273,6 @@ class Merger(object):
 
       for node in other_config.GetNodeList():
         node_info = other_config.GetNodeInfo(node)
-        node_info.master_candidate = False
         my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
         fake_ec_id += 1