From 90d0204a43f67b8b87d57a4d4e58d13d56cf3563 Mon Sep 17 00:00:00 2001 From: James Denton Date: Thu, 8 Sep 2022 19:46:59 -0500 Subject: [PATCH] Replace pxe_append_params with kernel_pxe_params in ironic.conf Ironic has replaced deprecated pxe_append_params config option with kernel_pxe_params. The ironic.conf template has been changed accordingly, but support remains for config override ironic_pxe_append_params. Change-Id: Icedd2b8f0e81607caba93afd34557bd4c3a88b4d --- defaults/main.yml | 2 +- .../deprecate_pxe_append_params-3a75d8e44da7007d.yaml | 8 ++++++++ templates/ironic.conf.j2 | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/deprecate_pxe_append_params-3a75d8e44da7007d.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 52309330..33ce32a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -303,7 +303,7 @@ ironic_policy_overrides: {} ironic_api_uwsgi_ini_overrides: {} # pxe boot -ironic_pxe_append_params: "ipa-debug=1 systemd.journald.forward_to_console=yes" +ironic_kernel_append_params: "ipa-debug=1 systemd.journald.forward_to_console=yes" ironic_api_init_config_overrides: {} ironic_conductor_init_config_overrides: {} diff --git a/releasenotes/notes/deprecate_pxe_append_params-3a75d8e44da7007d.yaml b/releasenotes/notes/deprecate_pxe_append_params-3a75d8e44da7007d.yaml new file mode 100644 index 00000000..97175ee6 --- /dev/null +++ b/releasenotes/notes/deprecate_pxe_append_params-3a75d8e44da7007d.yaml @@ -0,0 +1,8 @@ +--- +deprecations: + - | + The `pxe_append_params` configuration option has been deprecated by + Ironic and replaced with `kernel_append_params`. The corresponding + configuration override, `ironic_pxe_append_params`, has been replaced + by `ironic_kernel_append_params` but will continue to be supported + until a future undetermined release. diff --git a/templates/ironic.conf.j2 b/templates/ironic.conf.j2 index 34804584..b09f0ff1 100644 --- a/templates/ironic.conf.j2 +++ b/templates/ironic.conf.j2 @@ -203,7 +203,7 @@ uefi_pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template {% endif %} tftp_server = {{ ironic_tftp_server_address }} -pxe_append_params = {{ ironic_pxe_append_params }} +kernel_append_params = {{ ironic_pxe_append_params | default(ironic_kernel_append_params) }} tftp_root = {{ ironic_tftpd_root }} tftp_master_path = {{ ironic_tftpd_root }}/master_images