Revision 32389d91 lib/masterd/iallocator.py
b/lib/masterd/iallocator.py | ||
---|---|---|
431 | 431 |
node_whitelist = None |
432 | 432 |
|
433 | 433 |
es_flags = rpc.GetExclusiveStorageForNodes(self.cfg, node_list) |
434 |
vg_req = rpc.BuildVgInfoQuery(self.cfg) |
|
435 |
has_lvm = bool(vg_req) |
|
434 |
storage_units = utils.storage.GetStorageUnitsOfCluster( |
|
435 |
self.cfg, include_spindles=True) |
|
436 |
has_lvm = utils.storage.IsLvmEnabled(cluster_info.enabled_disk_templates) |
|
436 | 437 |
hvspecs = [(hypervisor_name, cluster_info.hvparams[hypervisor_name])] |
437 |
node_data = self.rpc.call_node_info(node_list, vg_req,
|
|
438 |
node_data = self.rpc.call_node_info(node_list, storage_units,
|
|
438 | 439 |
hvspecs, es_flags) |
439 | 440 |
node_iinfo = \ |
440 | 441 |
self.rpc.call_all_instances_info(node_list, |
... | ... | |
551 | 552 |
|
552 | 553 |
# TODO: replace this with proper storage reporting |
553 | 554 |
if has_lvm: |
554 |
total_disk = get_attr("vg_size")
|
|
555 |
free_disk = get_attr("vg_free")
|
|
555 |
total_disk = get_attr("storage_size")
|
|
556 |
free_disk = get_attr("storage_free")
|
|
556 | 557 |
total_spindles = get_attr("spindles_total") |
557 | 558 |
free_spindles = get_attr("spindles_free") |
558 | 559 |
else: |
Also available in: Unified diff