From dd8264176cdbf6c37375585f9480ef76991b8077 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 29 Sep 2020 14:04:04 +0100
Subject: [PATCH] Update ironic iPXE configuration
* ipxe_enabled was removed in Ussuri, now there is a separate ipxe boot
interface.
* iPXE now has its own set of configuration for the bootfile and config
template, and the values previously set when iPXE is enabled are now
the default in ironic. The overrides have been removed, since they
match the iPXE defaults.
Change-Id: I9d9f030ee4be979d0a849b59e5eb991f2d82f6a4
---
ansible/roles/ironic/templates/ironic.conf.j2 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2
index 7854d0eccc..e0c5064483 100644
--- a/ansible/roles/ironic/templates/ironic.conf.j2
+++ b/ansible/roles/ironic/templates/ironic.conf.j2
@@ -184,11 +184,6 @@ deploy_logs_collect = always
[pxe]
pxe_append_params = nofb nomodeset vga=normal console=tty0 console=ttyS0,{{ ironic_console_serial_speed }}
{% if enable_ironic_ipxe | bool %}
-ipxe_enabled = True
-pxe_bootfile_name = undionly.kpxe
-uefi_pxe_bootfile_name = ipxe.efi
-pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template
-uefi_pxe_config_template = $pybasedir/drivers/modules/ipxe_config.template
tftp_root = /httpboot
tftp_master_path = /httpboot/master_images
tftp_server = {{ api_interface_address }}