diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-12 17:13:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-12 17:13:20 +0000 |
| commit | e3dfde7148a1b842804ff6f74655dfce6785bab7 (patch) | |
| tree | 359cdb53053def808e5b10be184dc7fb149a8437 /nova | |
| parent | 24e86f40f7230544666ef99650353da76a1b9297 (diff) | |
| parent | b415d675f544d8cffed8f82dac9d251fd5620cb1 (diff) | |
Merge "Removes unnecessary db query for instance type"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 743efd595..9483055aa 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -57,7 +57,6 @@ from xml.dom import minidom from nova.api.metadata import base as instance_metadata from nova import block_device -from nova.compute import instance_types from nova.compute import power_state from nova.compute import vm_mode from nova import config @@ -1311,8 +1310,7 @@ class LibvirtDriver(driver.ComputeDriver): root_fname = hashlib.sha1(str(disk_images['image_id'])).hexdigest() size = instance['root_gb'] * 1024 * 1024 * 1024 - inst_type_id = instance['instance_type_id'] - inst_type = instance_types.get_instance_type(inst_type_id) + inst_type = instance['instance_type'] if size == 0 or suffix == '.rescue': size = None @@ -1678,10 +1676,7 @@ class LibvirtDriver(driver.ComputeDriver): 'ramdisk_id' if a ramdisk is needed for the rescue image and 'kernel_id' if a kernel is needed for the rescue image. """ - # FIXME(vish): stick this in db - inst_type_id = instance['instance_type_id'] - inst_type = instance_types.get_instance_type(inst_type_id, - inactive=True) + inst_type = instance['instance_type'] guest = vconfig.LibvirtConfigGuest() guest.virt_type = CONF.libvirt_type |