diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-08 22:38:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-08 22:38:34 +0000 |
| commit | 3152a9dfeb62d07bf65470dc542f987ebed387a4 (patch) | |
| tree | 4f1b737823bd44d64d660276cc93879b8345b8bc /nova/virt | |
| parent | 8b6834f54a57271e3e2d55cd25a62dc320d610cd (diff) | |
| parent | 5fdcf190aa79eaa04b20cc6acf63dd99bce5e106 (diff) | |
Merge "Remove uses of instance['instance_type'] from libvirt driver."
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 3 | ||||
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 3e4b3995c..88f97a271 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -66,6 +66,7 @@ variables / types used """ from nova import block_device +from nova.compute import instance_types from nova import exception from nova.openstack.common import log as logging from nova.virt import configdrive @@ -296,7 +297,7 @@ def get_disk_mapping(virt_type, instance, Returns the guest disk mapping for the devices.""" - inst_type = instance['instance_type'] + inst_type = instance_types.extract_instance_type(instance) mapping = {} diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 9858e0af2..625560773 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -63,6 +63,7 @@ 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 task_states from nova.compute import vm_mode @@ -1773,7 +1774,7 @@ class LibvirtDriver(driver.ComputeDriver): root_fname = imagecache.get_cache_fname(disk_images, 'image_id') size = instance['root_gb'] * 1024 * 1024 * 1024 - inst_type = instance['instance_type'] + inst_type = instance_types.extract_instance_type(instance) if size == 0 or suffix == '.rescue': size = None |