From 4cdcf1dbffe20ce406e8d4b93a972480e9cb02a0 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 24 Jan 2012 20:04:56 -0600 Subject: Fixes bug 921265 - i'nova-manage flavor create|list' These problems were introduced in https://review.openstack.org/2918 * nova-manage needs the change from local_gb to root_gb/ephemeral_gb. * fixes 'nova-manage flavor ...' * fixes 'nova-manage service describe_resource ...' Change-Id: I63040359a425aac3ef7a0a84e6834b1dfe3a8790 --- nova/db/sqlalchemy/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova') diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 43b386945..db97c115e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -472,7 +472,8 @@ def _get_host_utilization(context, host, ram_mb, disk_gb): work = 0 for instance in instances: free_ram_mb -= instance.memory_mb - free_disk_gb -= instance.local_gb + free_disk_gb -= instance.root_gb + free_disk_gb -= instance.ephemeral_gb if instance.vm_state in [vm_states.BUILDING, vm_states.REBUILDING, vm_states.MIGRATING, vm_states.RESIZING]: work += 1 -- cgit