diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 30f7b03c9b..a22c9bb759 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -255,6 +255,7 @@ ironic_dnsmasq_interface: "{{ api_interface }}" ironic_dnsmasq_dhcp_range: ironic_dnsmasq_default_gateway: ironic_dnsmasq_boot_file: "{% if enable_ironic_ipxe | bool %}undionly.kpxe{% else %}pxelinux.0{% endif %}" +ironic_dnsmasq_uefi_ipxe_boot_file: "snponly.efi" ironic_cleaning_network: ironic_console_serial_speed: "115200n8" ironic_ipxe_url: "http://{{ api_interface_address | put_address_in_context('url') }}:{{ ironic_ipxe_port }}" diff --git a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 index 218ac8d44a..c02dc07cf3 100644 --- a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 @@ -26,7 +26,7 @@ dhcp-match=set:efi,option:client-arch,9 dhcp-option=tag:ipxe,option:bootfile-name,{{ ironic_ipxe_url }}/inspector.ipxe # Client is PXE booting over EFI without iPXE ROM, # send EFI version of iPXE chainloader -dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,ipxe.efi +dhcp-option=tag:efi,tag:!ipxe,option:bootfile-name,{{ ironic_dnsmasq_uefi_ipxe_boot_file }} {% endif %} dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }} {% endif %}{# ipv6/ipv4 #} diff --git a/releasenotes/notes/ironic-dnsmasq-uefi-ipxe-bootloader-a1b0eef3257ee55a.yaml b/releasenotes/notes/ironic-dnsmasq-uefi-ipxe-bootloader-a1b0eef3257ee55a.yaml new file mode 100644 index 0000000000..9efff76fa6 --- /dev/null +++ b/releasenotes/notes/ironic-dnsmasq-uefi-ipxe-bootloader-a1b0eef3257ee55a.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The bootloader used to boot Ironic nodes in UEFI boot mode during + inspection when iPXE is enabled has been changed from ``ipxe.efi`` to + ``snponly.efi``. This is in line with the default UEFI iPXE bootloader used + in Ironic since the Xena release. The bootloader may be changed via + ``ironic_dnsmasq_uefi_ipxe_boot_file``.