Add new Nova patch file for Pike
The existing diff finally doesn't apply cleanly, so we need a new one for Pike and up.changes/90/631290/1
parent
f01cc0e10a
commit
5aa4bce35b
@ -0,0 +1,15 @@
|
||||
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
|
||||
index 0139f80..0db3661 100644
|
||||
--- a/nova/virt/libvirt/driver.py
|
||||
+++ b/nova/virt/libvirt/driver.py
|
||||
@@ -4777,6 +4777,10 @@ class LibvirtDriver(driver.ComputeDriver):
|
||||
self._conf_non_lxc_uml(virt_type, guest, root_device_name, rescue,
|
||||
instance, inst_path, image_meta, disk_info)
|
||||
|
||||
+ if (CONF.libvirt.virt_type in ['qemu', 'kvm'] and
|
||||
+ instance.metadata.get('libvirt:pxe-first')):
|
||||
+ guest.os_boot_dev = ['network'] + guest.os_boot_dev
|
||||
+
|
||||
self._set_features(guest, instance.os_type, caps, virt_type,
|
||||
image_meta)
|
||||
self._set_clock(guest, instance.os_type, image_meta, virt_type)
|
Loading…
Reference in New Issue