openstack
/
nova
Code Issues Proposed changes

Merge "libvirt: virt rescue method now supports objects"

This commit is contained in:
Jenkins 2014-07-03 14:51:44 +00:00 committed by Gerrit Code Review
parent 328643a730 22fafee19b
commit c4080c9760
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2169,11 +2169,11 @@ class LibvirtDriver(driver.ComputeDriver):
rescue_images = {
'image_id': (rescue_image_id or
CONF.libvirt.rescue_image_id or instance['image_ref']),
CONF.libvirt.rescue_image_id or instance.image_ref),
'kernel_id': (CONF.libvirt.rescue_kernel_id or
instance['kernel_id']),
instance.kernel_id),
'ramdisk_id': (CONF.libvirt.rescue_ramdisk_id or
instance['ramdisk_id']),
instance.ramdisk_id),
}
disk_info = blockinfo.get_disk_info(CONF.libvirt.virt_type,
instance,