Commit 770461fe authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Fix cluster verify error on master-ip-setup script



This error does not show up until we exceed the pool of master
candidates and have nodes which are not master candidates.

The background is that we check for master-ip-setup script on master
candidates and expect them not to be on the other nodes. However, we
distribute a default master-ip-script which break this assumption.
Furthermore, there's no reason why the file should just exists on the
master candidates.
Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 6438e259
......@@ -4310,6 +4310,9 @@ def _ComputeAncillaryFiles(cluster, redist):
if cluster.modify_etc_hosts:
files_all.add(constants.ETC_HOSTS)
 
if cluster.use_external_mip_script:
files_all.add(constants.EXTERNAL_MASTER_SETUP_SCRIPT)
# Files which are optional, these must:
# - be present in one other category as well
# - either exist or not exist on all nodes of that category (mc, vm all)
......@@ -4323,10 +4326,6 @@ def _ComputeAncillaryFiles(cluster, redist):
if not redist:
files_mc.add(constants.CLUSTER_CONF_FILE)
 
# FIXME: this should also be replicated but Ganeti doesn't support files_mc
# replication
files_mc.add(constants.DEFAULT_MASTER_SETUP_SCRIPT)
# Files which should only be on VM-capable nodes
files_vm = set(filename
for hv_name in cluster.enabled_hypervisors
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment