Revision 4504bfcb

b/lib/cmdlib.py
9005 9005

  
9006 9006
  all_result = True
9007 9007
  ports_to_release = set()
9008
  for (idx, device) in enumerate(instance.disks):
9008
  anno_disks = _AnnotateDiskParams(instance, instance.disks, lu.cfg)
9009
  for (idx, device) in enumerate(anno_disks):
9009 9010
    if target_node:
9010 9011
      edata = [(target_node, device)]
9011 9012
    else:
......
12691 12692
    snode = instance.secondary_nodes[0]
12692 12693
    feedback_fn("Converting template to plain")
12693 12694

  
12694
    old_disks = instance.disks
12695
    new_disks = [d.children[0] for d in old_disks]
12695
    old_disks = _AnnotateDiskParams(instance, instance.disks, self.cfg)
12696
    new_disks = [d.children[0] for d in instance.disks]
12696 12697

  
12697 12698
    # copy over size and mode
12698 12699
    for parent, child in zip(old_disks, new_disks):
......
12782 12783
    """Removes a disk.
12783 12784

  
12784 12785
    """
12785
    for node, disk in root.ComputeNodeTree(self.instance.primary_node):
12786
    (anno_disk,) = _AnnotateDiskParams(self.instance, [root], self.cfg)
12787
    for node, disk in anno_disk.ComputeNodeTree(self.instance.primary_node):
12786 12788
      self.cfg.SetDiskID(disk, node)
12787 12789
      msg = self.rpc.call_blockdev_remove(node, disk).fail_msg
12788 12790
      if msg:

Also available in: Unified diff