diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-05-17 15:18:55 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-05-17 16:12:30 +0200 |
| commit | 2a73f5a84e06b370d0b04997cc0787497e111642 (patch) | |
| tree | 4d3f0fcb9a4bebea1b09fdb33b499f3183d9f9ed /ironic/drivers/modules/irmc | |
| parent | af94a3da1e3f66c70309bbb889c68dfc5bd67e9f (diff) | |
| download | ironic-2a73f5a84e06b370d0b04997cc0787497e111642.tar.gz | |
Clean up kernel_append_params for PXE/iPXE
Currently handling of kernel_append_params is very inconsistent. This
change applies a straightforward process:
1. instance_info[kernel_append_params]
2. driver_info[kernel_append_params]
3. [pxe]kernel_append_params (renamed from pxe_append_params).
Also adds a helper for subsequent fixes in other drivers.
Change-Id: I79bcf4d8ef1f0f55a82e0991dd5bb1685b3f7957
Story: #2008902
Task: #42469
Diffstat (limited to 'ironic/drivers/modules/irmc')
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index 60ab2fa2e..77244bda7 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/ironic/drivers/modules/irmc/boot.py @@ -308,7 +308,8 @@ def _prepare_boot_iso(task, root_uuid): deploy_iso_href = deploy_info['irmc_deploy_iso'] boot_mode = boot_mode_utils.get_boot_mode(task.node) - kernel_params = CONF.pxe.pxe_append_params + # FIXME(dtantsur): why is iRMC virtual media using PXE options? + kernel_params = CONF.pxe.kernel_append_params boot_iso_filename = _get_iso_name(task.node, label='boot') boot_iso_fullpathname = os.path.join( |