From a4223f1d89ea7033cbae35790a0411ec439cdb6d Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Fri, 6 Jan 2012 12:57:37 -0800 Subject: KVM and XEN Disk Management Parity Implements blueprint disk-configuration-parity This change splits local_gb into root_gb and ephemeral_gb. libvirt interpreted local_gb as what ephemeral_gb is now, whereas XenAPI interpreted local_gb as what root_gb is now. Change-Id: I496600991bac1e990326d4ded1607fee08209d68 --- nova/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/utils.py') diff --git a/nova/utils.py b/nova/utils.py index 90e06bcb5..bd68c6966 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -409,7 +409,7 @@ def usage_from_instance(instance_ref, network_info=None, **kw): instance_type=instance_ref['instance_type']['name'], instance_type_id=instance_ref['instance_type_id'], memory_mb=instance_ref['memory_mb'], - disk_gb=instance_ref['local_gb'], + disk_gb=instance_ref['root_gb'] + instance_ref['ephemeral_gb'], display_name=instance_ref['display_name'], created_at=str(instance_ref['created_at']), launched_at=str(instance_ref['launched_at']) \ -- cgit