openstack
/
puppet-ironic
Code Issues Proposed changes

Stable-only: Fix the ignored kernel_append_params parameter 

The kernel_append_params parameter was deprecated by [1] but it was
unexpectedly made ineffective by that change. This change fixes that
and ensure the deprecated parmaeter takes effect in case it is still
used.

[1] 541157fe29

Change-Id: I2b31db4a1eed377ebfa2ded26284506a85eca450
This commit is contained in:
Takashi Kajinami 2022-06-19 22:34:23 +09:00
parent 4a97b33475
commit 7dfd9b9be0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/drivers/pxe.pp
View File

@ -183,14 +183,14 @@ class ironic::drivers::pxe (
warning('The ironic::drivers::pxe::pxe_append_params parameter is deprecated. \
Use the kernel_append_params parameter instead')
}
$kernel_append_params_real = pick($pxe_append_params, kernel_append_params)
$kernel_append_params_real = pick($pxe_append_params, $kernel_append_params)
ironic_config {
'pxe/pxe_append_params': ensure => absent
}
# Configure ironic.conf
ironic_config {
'pxe/kernel_append_params': value => $kernel_append_params;
'pxe/kernel_append_params': value => $kernel_append_params_real;
'pxe/pxe_bootfile_name': value => $pxe_bootfile_name;
'pxe/pxe_config_template': value => $pxe_config_template;
'pxe/ipxe_bootfile_name': value => $ipxe_bootfile_name;