Revision 3439fd6b

b/lib/backend.py
215 215
    hv_class = hypervisor.GetHypervisorClass(hv_name)
216 216
    allowed_files.update(hv_class.GetAncillaryFiles()[0])
217 217

  
218
  assert pathutils.FILE_STORAGE_PATHS_FILE not in allowed_files, \
219
    "Allowed file storage paths should never be uploaded via RPC"
220

  
218 221
  return frozenset(allowed_files)
219 222

  
220 223

  
b/lib/cmdlib.py
4291 4291
    pathutils.RAPI_USERS_FILE,
4292 4292
    ])
4293 4293

  
4294
  if not redist:
4295
    files_all.update(pathutils.ALL_CERT_FILES)
4296
    files_all.update(ssconf.SimpleStore().GetFileList())
4297
  else:
4294
  if redist:
4298 4295
    # we need to ship at least the RAPI certificate
4299 4296
    files_all.add(pathutils.RAPI_CERT_FILE)
4297
  else:
4298
    files_all.update(pathutils.ALL_CERT_FILES)
4299
    files_all.update(ssconf.SimpleStore().GetFileList())
4300 4300

  
4301 4301
  if cluster.modify_etc_hosts:
4302 4302
    files_all.add(constants.ETC_HOSTS)
......
4317 4317
  if not redist:
4318 4318
    files_mc.add(pathutils.CLUSTER_CONF_FILE)
4319 4319

  
4320
  # File storage
4321
  if (not redist and
4322
      (constants.ENABLE_FILE_STORAGE or constants.ENABLE_SHARED_FILE_STORAGE)):
4323
    files_all.add(pathutils.FILE_STORAGE_PATHS_FILE)
4324
    files_opt.add(pathutils.FILE_STORAGE_PATHS_FILE)
4325

  
4320 4326
  # Files which should only be on VM-capable nodes
4321 4327
  files_vm = set(
4322 4328
    filename
......
4338 4344
  assert all_files_set.issuperset(files_opt), \
4339 4345
         "Optional file not in a different required list"
4340 4346

  
4347
  # This one file should never ever be re-distributed via RPC
4348
  assert not (redist and
4349
              pathutils.FILE_STORAGE_PATHS_FILE in all_files_set)
4350

  
4341 4351
  return (files_all, files_opt, files_mc, files_vm)
4342 4352

  
4343 4353

  

Also available in: Unified diff