openstack/ironic
Code Issues Proposed changes

Merge "grub: directly load linked config file"

Browse Source
This commit is contained in:
Zuul 2024-07-22 17:05:47 +00:00 committed by Gerrit Code Review
commit 6d5bcdf42d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ironic/drivers/modules/initial_grub_cfg.template
View File

@ -1,7 +1,4 @@
set default=initial echo Booting from $prefix
set timeout=5
set hidden_timeout_quiet=false source {{ tftp_root }}/$net_default_mac.conf
menuentry "initial" {
configfile {{ tftp_root }}/$net_default_mac.conf
}

2
ironic/tests/unit/common/test_pxe_utils.py
View File

@ -1248,7 +1248,7 @@ class TestPXEUtils(db_base.DbTestCase):
def write_to_file(path, contents): def write_to_file(path, contents):
self.assertIn('/grub/grub.cfg', path) self.assertIn('/grub/grub.cfg', path)
self.assertIn( self.assertIn(
'configfile /tftpboot/$net_default_mac.conf', 'source /tftpboot/$net_default_mac.conf',
contents contents
) )

7
releasenotes/notes/grub-default-template-change-a7bacdef4543a9ae.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes the default grub initial configuration to be simpler and directly
load the generated configuration file. The template also includes output
which also help operators understand the context as to where the node is
booting from, should issues be encountered.