diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-24 17:17:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-24 17:17:34 +0000 |
| commit | 1a5be710241eb14840b202c797b7616a22f805bc (patch) | |
| tree | 7858a7329037d2bf7cf0b61664cd422d05e80a5a /nova/utils.py | |
| parent | 0343585f790939bf9d611feb65ed8557b3173d75 (diff) | |
| parent | a4223f1d89ea7033cbae35790a0411ec439cdb6d (diff) | |
Merge "KVM and XEN Disk Management Parity"
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 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']) \ |