openstack
/
ironic
Code Issues Proposed changes

Merge "grub configuration should use user kernel & ramdisk" into stable/train

This commit is contained in:
Zuul 2019-10-10 13:42:53 +00:00 committed by Gerrit Code Review
parent 8ecae41ee1 ce9bc55c10
commit b8ae681b37
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" {
linuxefi {{ pxe_options.deployment_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 }}
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.ari_path }}
}
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" {
linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_kernel root=/dev/ram0 text test_param ramdisk_param
initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/deploy_ramdisk
linuxefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/kernel root=/dev/ram0 text test_param ramdisk_param
initrdefi /tftpboot/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ramdisk
}
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.