Revision 850c53f1 lib/cmdlib/instance_storage.py

b/lib/cmdlib/instance_storage.py
413 413
def GenerateDiskTemplate(
414 414
  lu, template_name, instance_uuid, primary_node_uuid, secondary_node_uuids,
415 415
  disk_info, file_storage_dir, file_driver, base_index,
416
  feedback_fn, full_disk_params, _req_file_storage=opcodes.RequireFileStorage,
417
  _req_shr_file_storage=opcodes.RequireSharedFileStorage):
416
  feedback_fn, full_disk_params):
418 417
  """Generate the entire disk layout for a given template type.
419 418

  
420 419
  """
......
422 421
  disk_count = len(disk_info)
423 422
  disks = []
424 423

  
424
  CheckDiskTemplateEnabled(lu.cfg.GetClusterInfo(), template_name)
425

  
425 426
  if template_name == constants.DT_DISKLESS:
426 427
    pass
427 428
  elif template_name == constants.DT_DRBD8:
......
457 458
    if secondary_node_uuids:
458 459
      raise errors.ProgrammerError("Wrong template configuration")
459 460

  
460
    if template_name == constants.DT_FILE:
461
      _req_file_storage()
462
    elif template_name == constants.DT_SHARED_FILE:
463
      _req_shr_file_storage()
464

  
465 461
    name_prefix = _DISK_TEMPLATE_NAME_PREFIX.get(template_name, None)
466 462
    if name_prefix is None:
467 463
      names = None

Also available in: Unified diff