openstack/kolla-ansible
Code Issues Proposed changes

ironic: sync default inspection UEFI iPXE bootloader with Ironic

Browse Source 
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.

Note that snponly.efi was not available via in the ironic-pxe image
prior to I79e78dca550262fc86b092a036f9ea96b214ab48.

Related-Bug: #1959203

Change-Id: I879db340769cc1b076e77313dff15876e27fcac4
This commit is contained in:
Mark Goddard 2022-02-10 11:46:46 +00:00
parent 654edefca3
commit 556d979930
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/ironic/defaults/main.yml
View File

@ -255,6 +255,7 @@ ironic_dnsmasq_interface: "{{ api_interface }}"
ironic_dnsmasq_dhcp_range: ironic_dnsmasq_dhcp_range:
ironic_dnsmasq_default_gateway: ironic_dnsmasq_default_gateway:
ironic_dnsmasq_boot_file: "{% if enable_ironic_ipxe | bool %}undionly.kpxe{% else %}pxelinux.0{% endif %}" 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_cleaning_network:
ironic_console_serial_speed: "115200n8" ironic_console_serial_speed: "115200n8"
ironic_ipxe_url: "http://{{ api_interface_address | put_address_in_context('url') }}:{{ ironic_ipxe_port }}" ironic_ipxe_url: "http://{{ api_interface_address | put_address_in_context('url') }}:{{ ironic_ipxe_port }}"

2
ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2
View File

@ -26,7 +26,7 @@ dhcp-match=set:efi,option:client-arch,9
dhcp-option=tag:ipxe,option:bootfile-name,{{ ironic_ipxe_url }}/inspector.ipxe dhcp-option=tag:ipxe,option:bootfile-name,{{ ironic_ipxe_url }}/inspector.ipxe
# Client is PXE booting over EFI without iPXE ROM, # Client is PXE booting over EFI without iPXE ROM,
# send EFI version of iPXE chainloader # 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 %} {% endif %}
dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }} dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }}
{% endif %}{# ipv6/ipv4 #} {% endif %}{# ipv6/ipv4 #}

8
releasenotes/notes/ironic-dnsmasq-uefi-ipxe-bootloader-a1b0eef3257ee55a.yaml Normal file
View File

@ -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``.