From cfdeb8aca68f4d38f7da94667abb778ad2868bb9 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 20 Aug 2015 14:24:00 -0700 Subject: [PATCH] libvirt: only get bdm in _create_domain_setup_lxc if booted from volume 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 --- nova/virt/libvirt/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 83b1bc32b94a..64e087ee9ae7 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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)