Revision bb3011ad lib/cmdlib/cluster.py
b/lib/cmdlib/cluster.py | ||
---|---|---|
612 | 612 |
pnode = instance.primary_node |
613 | 613 |
if pnode not in per_node_disks: |
614 | 614 |
per_node_disks[pnode] = [] |
615 |
for idx, disk in enumerate(instance.disks):
|
|
615 |
for idx, disk in enumerate(self.cfg.GetInstanceDisks(instance)):
|
|
616 | 616 |
per_node_disks[pnode].append((instance, idx, disk)) |
617 | 617 |
|
618 | 618 |
assert not (frozenset(per_node_disks.keys()) - |
... | ... | |
2376 | 2376 |
" that have exclusive storage set: %s", |
2377 | 2377 |
instance.disk_template, |
2378 | 2378 |
utils.CommaJoin(self.cfg.GetNodeNames(es_nodes))) |
2379 |
for (idx, disk) in enumerate(instance.disks):
|
|
2379 |
for (idx, disk) in enumerate(self.cfg.GetInstanceDisks(instance)):
|
|
2380 | 2380 |
self._ErrorIf(disk.spindles is None, |
2381 | 2381 |
constants.CV_EINSTANCEMISSINGCFGPARAMETER, instance.name, |
2382 | 2382 |
"number of spindles not configured for disk %s while" |
... | ... | |
3054 | 3054 |
if instanceinfo[uuid].disk_template == diskless) |
3055 | 3055 |
disks = [(inst_uuid, disk) |
3056 | 3056 |
for inst_uuid in node_inst_uuids |
3057 |
for disk in instanceinfo[inst_uuid].disks]
|
|
3057 |
for disk in self.cfg.GetInstanceDisks(instanceinfo[inst_uuid])]
|
|
3058 | 3058 |
|
3059 | 3059 |
if not disks: |
3060 | 3060 |
nodisk_instances.update(uuid for uuid in node_inst_uuids |
Also available in: Unified diff