Revision 1c474f2b lib/cmdlib/cluster.py

b/lib/cmdlib/cluster.py
610 610
      pnode = instance.primary_node
611 611
      if pnode not in per_node_disks:
612 612
        per_node_disks[pnode] = []
613
      for idx, disk in enumerate(instance.disks):
613
      for idx, disk in enumerate(self.cfg.GetInstanceDisks(instance)):
614 614
        per_node_disks[pnode].append((instance, idx, disk))
615 615

  
616 616
    assert not (frozenset(per_node_disks.keys()) -
......
2381 2381
                    " that have exclusive storage set: %s",
2382 2382
                    instance.disk_template,
2383 2383
                    utils.CommaJoin(self.cfg.GetNodeNames(es_nodes)))
2384
      for (idx, disk) in enumerate(instance.disks):
2384
      for (idx, disk) in enumerate(self.cfg.GetInstanceDisks(instance)):
2385 2385
        self._ErrorIf(disk.spindles is None,
2386 2386
                      constants.CV_EINSTANCEMISSINGCFGPARAMETER, instance.name,
2387 2387
                      "number of spindles not configured for disk %s while"
......
3059 3059
                                if instanceinfo[uuid].disk_template == diskless)
3060 3060
      disks = [(inst_uuid, disk)
3061 3061
               for inst_uuid in node_inst_uuids
3062
               for disk in instanceinfo[inst_uuid].disks]
3062
               for disk in self.cfg.GetInstanceDisks(instanceinfo[inst_uuid])]
3063 3063

  
3064 3064
      if not disks:
3065 3065
        nodisk_instances.update(uuid for uuid in node_inst_uuids

Also available in: Unified diff