Revision 3fffa0c6 lib/objects.py

b/lib/objects.py
857 857

  
858 858
    result = list()
859 859
    dt_params = disk_params[disk_template]
860

  
860 861
    if disk_template == constants.DT_DRBD8:
861 862
      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_DRBD8], {
862 863
        constants.LDP_RESYNC_RATE: dt_params[constants.DRBD_RESYNC_RATE],
......
884 885
        constants.LDP_STRIPES: dt_params[constants.DRBD_META_STRIPES],
885 886
        }))
886 887

  
887
    elif disk_template in (constants.DT_FILE, constants.DT_SHARED_FILE):
888
      result.append(constants.DISK_LD_DEFAULTS[disk_template])
889

  
890
    elif disk_template == constants.DT_PLAIN:
891
      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_PLAIN], {
892
        constants.LDP_STRIPES: dt_params[constants.LV_STRIPES],
893
        }))
894

  
895
    elif disk_template == constants.DT_BLOCK:
896
      result.append(constants.DISK_LD_DEFAULTS[constants.DT_BLOCK])
897

  
898
    elif disk_template == constants.DT_RBD:
899
      result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_RBD], {
900
        constants.LDP_POOL: dt_params[constants.RBD_POOL],
901
        constants.LDP_ACCESS: dt_params[constants.RBD_ACCESS],
902
        }))
903

  
904
    elif disk_template == constants.DT_EXT:
905
      result.append(constants.DISK_LD_DEFAULTS[constants.DT_EXT])
888
    else:
889
      defaults = constants.DISK_LD_DEFAULTS[disk_template]
890
      values = {}
891
      for field in defaults:
892
        values[field] = dt_params[field]
893
      result.append(FillDict(defaults, values))
906 894

  
907 895
    return result
908 896

  

Also available in: Unified diff