Revision 2fb309ce lib/cmdlib.py

b/lib/cmdlib.py
11438 11438 
        "vcpus": beinfo[constants.BE_VCPUS],
11439 11439 
        "memory": beinfo[constants.BE_MEMORY],
11440 11440 
        "os": iinfo.os,
11441 
        "nodes": [iinfo.primary_node] + list(iinfo.secondary_nodes),
11442 11441 
        "nics": nic_data,
11443 11442 
        "disks": [{"size": dsk.size, "mode": dsk.mode} for dsk in iinfo.disks],
11444 11443 
        "disk_template": iinfo.disk_template,
......
11446 11445 
        }
11447 11446 
      pir["disk_space_total"] = _ComputeDiskSize(iinfo.disk_template,
11448 11447 
                                                 pir["disks"])
11448 
      # hail's relocation mode does not work without secondaries,
11449 
      # as it exclusively tries replace-secondary moves. So, let's trick hail
11450 
      # by specifying our primary and secondary node to be the same.
11451 
      if iinfo.disk_template in constants.DTS_EXT_MIRROR:
11452 
        pir["nodes"] = [iinfo.primary_node, iinfo.primary_node]
11453 
      else:
11454 
        pir["nodes"] = [iinfo.primary_node] + list(iinfo.secondary_nodes)
11449 11455 
      instance_data[iinfo.name] = pir
11450 11456 

  		





  11451
  11457
  
    
    return instance_data


  		












Also available in:
  Unified diff