diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-05 03:00:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-05 03:00:32 +0000 |
| commit | 81da7771aaa6eec79f6b3fd91ce315cd5c5b7e7a (patch) | |
| tree | 5d52873967125e000e25e193746e777c5bfe0d85 /nova/compute | |
| parent | fd109710a4b3bd5596fe214567e19aeeffef50ec (diff) | |
| parent | a1e2c9fd2b1c8e24a7c7b263cd4679fca2a3bdc2 (diff) | |
| download | nova-81da7771aaa6eec79f6b3fd91ce315cd5c5b7e7a.tar.gz nova-81da7771aaa6eec79f6b3fd91ce315cd5c5b7e7a.tar.xz nova-81da7771aaa6eec79f6b3fd91ce315cd5c5b7e7a.zip | |
Merge "Remove remaining instance_types query from compute/manager"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 4bca22af2..377a8d6ea 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -902,8 +902,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 |