openstack/nova
Code Issues Proposed changes

libvirt: only get bdm in _create_domain_setup_lxc if booted from volume

Browse Source 
This is a simple little cleanup.  We don't need to call
driver.block_device_info_get_mapping unless we've determined that we're
booting from volume, so move that call within the conditional that uses
it.

Change-Id: Idaaef26f458e80876bcaae32bc6c065b4dfe60bf
This commit is contained in:
Matt Riedemann
2015-08-20 14:24:00 -07:00
parent 8579152745
commit cfdeb8aca6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/virt/libvirt/driver.py
View File

@@ -4428,12 +4428,12 @@ class LibvirtDriver(driver.ComputeDriver):
def _create_domain_setup_lxc(self, instance, image_meta,
block_device_info, disk_info):
inst_path = libvirt_utils.get_instance_path(instance)
block_device_mapping = driver.block_device_info_get_mapping(
block_device_info)
disk_info = disk_info or {}
disk_mapping = disk_info.get('mapping', {})
if self._is_booted_from_volume(instance, disk_mapping):
block_device_mapping = driver.block_device_info_get_mapping(
block_device_info)
root_disk = block_device.get_root_bdm(block_device_mapping)
disk_info = blockinfo.get_info_from_bdm(
instance, CONF.libvirt.virt_type, image_meta, root_disk)