From 2e4d851272e5696e858b7e3ea9159da703dc384b Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 23 Oct 2020 17:32:27 +0200 Subject: [PATCH] Stop using deprecated iPXE parameters In theory it allows using Bifrost with plain PXE, but I haven't tried it. Depends-On: https://review.opendev.org/759420 Change-Id: Id53ecbc167699727e59ae46936e054eb3195b829 --- .../roles/bifrost-ironic-install/templates/ironic.conf.j2 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index 5992a7e35..17c88b96b 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -61,16 +61,12 @@ pxe_append_params = console=ttyS0 ipa-insecure=1 {% else %} pxe_append_params = systemd.journald.forward_to_console=yes ipa-insecure=1 {{ extra_kernel_options | default('') }} {% endif %} -pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template tftp_server = {{ internal_ip }} tftp_root = /tftpboot -pxe_bootfile_name = undionly.kpxe -ipxe_enabled = true ipxe_boot_script = /etc/ironic/boot.ipxe tftp_master_path = {{ ironic_tftp_master_path }} {% if enable_uefi_ipxe | bool %} -uefi_pxe_bootfile_name = {{ ipxe_efi_binary }} -uefi_pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template +uefi_ipxe_bootfile_name = {{ ipxe_efi_binary }} {% endif %} enable_netboot_fallback = true