summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2013-01-29 20:41:54 -0500
committerDan Smith <danms@us.ibm.com>2013-02-04 15:21:51 -0500
commita1e2c9fd2b1c8e24a7c7b263cd4679fca2a3bdc2 (patch)
tree6aeceffce82ed721611d0c863c977c40f7946d6b
parenta053c4480caffbc62bbbd98b4583cba09fe5822a (diff)
downloadnova-a1e2c9fd2b1c8e24a7c7b263cd4679fca2a3bdc2.tar.gz
nova-a1e2c9fd2b1c8e24a7c7b263cd4679fca2a3bdc2.tar.xz
nova-a1e2c9fd2b1c8e24a7c7b263cd4679fca2a3bdc2.zip
Remove remaining instance_types query from compute/manager
Related to blueprint no-db-compute Change-Id: Ib4bf1731e408821f727f70dcc77b9883504ba960
-rw-r--r--nova/compute/manager.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index f84489de3..d422cb4c5 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -879,8 +879,7 @@ class ComputeManager(manager.SchedulerDependentManager):
# TODO(jk0): Should size be required in the image service?
return image_meta
- instance_type_id = instance['instance_type_id']
- instance_type = instance_types.get_instance_type(instance_type_id)
+ instance_type = instance_types.extract_instance_type(instance)
allowed_size_gb = instance_type['root_gb']
# NOTE(johannes): root_gb is allowed to be 0 for legacy reasons