summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Alvares Gomes <lucasagomes@gmail.com>2015-12-09 16:17:30 +0000
committerChris Krelle <chris.jam.krelle@hpe.com>2016-02-19 10:07:40 -0800
commit031d4f18f1c51f2a681e23548d892429cf936c68 (patch)
tree5c1f251b1655eb75a18c74e5f51d7632c8bae1d9
parent5b7dff955b0ecac13706483507bd56c1796aecb0 (diff)
downloadironic-031d4f18f1c51f2a681e23548d892429cf936c68.tar.gz
Fix iPXE template for whole disk image
The goto :boot_whole_disk section in the iPXE template is bogus, the "kernel" command is being used to chain the "chain.c32" file, that command should be "chain" and the "append" command is not a valid iPXE command. This patch replaces those commands with the "sanboot" command from iPXE which is (among other things) used to chain the boot process to the local disk. Closes-Bug: #1524403 Change-Id: I7d2310d94e40b1c9c76957382ab19c0076bf42cd (cherry picked from commit 952d5c5a06f35181768e52dd660afe548bc6fa60)
-rw-r--r--ironic/drivers/modules/ipxe_config.template4
-rw-r--r--ironic/tests/drivers/ipxe_config.template4
-rw-r--r--releasenotes/notes/fix-ipxe-template-for-whole-disk-image-943da0311ca7aeb5.yaml4
3 files changed, 6 insertions, 6 deletions
diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template
index 062776cc8..956430117 100644
--- a/ironic/drivers/modules/ipxe_config.template
+++ b/ironic/drivers/modules/ipxe_config.template
@@ -16,6 +16,4 @@ initrd {{ pxe_options.ari_path }}
boot
:boot_whole_disk
-kernel chain.c32
-append mbr:{{ DISK_IDENTIFIER }}
-boot
+sanboot --no-describe
diff --git a/ironic/tests/drivers/ipxe_config.template b/ironic/tests/drivers/ipxe_config.template
index bc803d4a7..1ca14c8f3 100644
--- a/ironic/tests/drivers/ipxe_config.template
+++ b/ironic/tests/drivers/ipxe_config.template
@@ -16,6 +16,4 @@ initrd http://1.2.3.4:1234/ramdisk
boot
:boot_whole_disk
-kernel chain.c32
-append mbr:{{ DISK_IDENTIFIER }}
-boot
+sanboot --no-describe
diff --git a/releasenotes/notes/fix-ipxe-template-for-whole-disk-image-943da0311ca7aeb5.yaml b/releasenotes/notes/fix-ipxe-template-for-whole-disk-image-943da0311ca7aeb5.yaml
new file mode 100644
index 000000000..b0ceb5b11
--- /dev/null
+++ b/releasenotes/notes/fix-ipxe-template-for-whole-disk-image-943da0311ca7aeb5.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+ - Fixes an issue with the provided iPXE template where whole disk images
+ could not be booted. See https://bugs.launchpad.net/ironic/+bug/1524403.