Revision f9193417 lib/cmdlib.py

b/lib/cmdlib.py
2713 2713
                           logical_id=(vgname, names[1]),
2714 2714
                           iv_name = "sdb")
2715 2715
    disks = [sda_dev, sdb_dev]
2716
  elif template_name == constants.DT_LOCAL_RAID1:
2717
    if len(secondary_nodes) != 0:
2718
      raise errors.ProgrammerError("Wrong template configuration")
2719

  
2720

  
2721
    names = _GenerateUniqueNames(cfg, [".sda_m1", ".sda_m2",
2722
                                       ".sdb_m1", ".sdb_m2"])
2723
    sda_dev_m1 = objects.Disk(dev_type=constants.LD_LV, size=disk_sz,
2724
                              logical_id=(vgname, names[0]))
2725
    sda_dev_m2 = objects.Disk(dev_type=constants.LD_LV, size=disk_sz,
2726
                              logical_id=(vgname, names[1]))
2727
    md_sda_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name = "sda",
2728
                              size=disk_sz,
2729
                              children = [sda_dev_m1, sda_dev_m2])
2730
    sdb_dev_m1 = objects.Disk(dev_type=constants.LD_LV, size=swap_sz,
2731
                              logical_id=(vgname, names[2]))
2732
    sdb_dev_m2 = objects.Disk(dev_type=constants.LD_LV, size=swap_sz,
2733
                              logical_id=(vgname, names[3]))
2734
    md_sdb_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name = "sdb",
2735
                              size=swap_sz,
2736
                              children = [sdb_dev_m1, sdb_dev_m2])
2737
    disks = [md_sda_dev, md_sdb_dev]
2738
  elif template_name == constants.DT_REMOTE_RAID1:
2739
    if len(secondary_nodes) != 1:
2740
      raise errors.ProgrammerError("Wrong template configuration")
2741
    remote_node = secondary_nodes[0]
2742
    names = _GenerateUniqueNames(cfg, [".sda_data", ".sda_meta",
2743
                                       ".sdb_data", ".sdb_meta"])
2744
    drbd_sda_dev = _GenerateMDDRBDBranch(cfg, primary_node, remote_node,
2745
                                         disk_sz, names[0:2])
2746
    md_sda_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name="sda",
2747
                              children = [drbd_sda_dev], size=disk_sz)
2748
    drbd_sdb_dev = _GenerateMDDRBDBranch(cfg, primary_node, remote_node,
2749
                                         swap_sz, names[2:4])
2750
    md_sdb_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name="sdb",
2751
                              children = [drbd_sdb_dev], size=swap_sz)
2752
    disks = [md_sda_dev, md_sdb_dev]
2753 2716
  elif template_name == constants.DT_DRBD8:
2754 2717
    if len(secondary_nodes) != 1:
2755 2718
      raise errors.ProgrammerError("Wrong template configuration")
......
2960 2923
    req_size_dict = {
2961 2924
      constants.DT_DISKLESS: None,
2962 2925
      constants.DT_PLAIN: self.op.disk_size + self.op.swap_size,
2963
      constants.DT_LOCAL_RAID1: (self.op.disk_size + self.op.swap_size) * 2,
2964 2926
      # 256 MB are added for drbd metadata, 128MB for each drbd device
2965
      constants.DT_REMOTE_RAID1: self.op.disk_size + self.op.swap_size + 256,
2966 2927
      constants.DT_DRBD8: self.op.disk_size + self.op.swap_size + 256,
2967 2928
    }
2968 2929

  

Also available in: Unified diff