b4a44e47d3
This patch still applies against Nova master, so it's not actually specific to kilo. To avoid confusion, let's just name the directory "nova". If it merge conflicts at some point we can add version-specific ones again.
15 lines
713 B
Diff
15 lines
713 B
Diff
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
|
|
index 6097fbf..e419df6 100644
|
|
--- a/nova/virt/libvirt/driver.py
|
|
+++ b/nova/virt/libvirt/driver.py
|
|
@@ -4012,6 +4012,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)
|
|
self._set_clock(guest, instance.os_type, image_meta, virt_type)
|