diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-01-06 12:57:37 -0800 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-01-24 16:54:23 +0000 |
| commit | a4223f1d89ea7033cbae35790a0411ec439cdb6d (patch) | |
| tree | bf3768b78a9ab8633b525b17579bc8326bbcab63 /nova/utils.py | |
| parent | 91bc67d81a9711fbf5a0f0c46bbf1d87232391f8 (diff) | |
| download | nova-a4223f1d89ea7033cbae35790a0411ec439cdb6d.tar.gz | |
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
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py index 90e06bcb5c..bd68c69666 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']) \ |