openstack/ironic
Code Issues Proposed changes

grub configuration should use user kernel & ramdisk

Browse Source 
compared with pxe_config.template, ramdisk boot with grub should use
aki_path and ari_path

Change-Id: Ibedf375cfeeb20917f06e52b1e86a6990a3c494b
Story: 2006639
Task: 36855
This commit is contained in:
shenjiatong 2019-09-29 09:01:24 +08:00 committed by Julia Kreger
parent fd8b9747cb
commit 2364c8b247
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/pxe_grub_config.template
View File

@ -13,8 +13,8 @@ menuentry "boot_partition" {
} }
menuentry "boot_ramdisk" { menuentry "boot_ramdisk" {
linuxefi {{ pxe_options.deployment_aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }} linuxefi {{ pxe_options.aki_path }} root=/dev/ram0 text {{ pxe_options.pxe_append_params|default("", true) }} {{ pxe_options.ramdisk_opts|default('', true) }}
initrdefi {{ pxe_options.deployment_ari_path }} initrdefi {{ pxe_options.ari_path }}
} }
menuentry "boot_whole_disk" { menuentry "boot_whole_disk" {

4
ironic/tests/unit/drivers/pxe_grub_config.template
View File

@ -13,8 +13,8 @@ menuentry "boot_partition" {
} }
menuentry "boot_ramdisk" { menuentry "boot_ramdisk" {
linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel root=/dev/ram0 text test_param ramdisk_param linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel root=/dev/ram0 text test_param ramdisk_param
initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
} }
menuentry "boot_whole_disk" { menuentry "boot_whole_disk" {

5
releasenotes/notes/ramdisk-grub-use-user-kernel-ramdisk-7d572fe130932605.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes a bug with the grub ramdisk boot template handling, such that the template now properly
references the user provided kernal and ramdisk. Previously the deployment ramdisk and kernel
was referenced in the template.