Switch to snponly and stop copying the unused ipxe.pxe

See the Ironic change for reasoning:
4d13da9cc7

Change-Id: Ia7e227b0f53ebc0f0bd25b91960174685b8b72a9
This commit is contained in:
Dmitry Tantsur 2024-01-17 10:57:48 +01:00
parent c64f6ba5c1
commit c1ac96ec87
No known key found for this signature in database
GPG Key ID: 315B2AF9FD216C60
5 changed files with 12 additions and 23 deletions

View File

@ -70,7 +70,7 @@ ipa_file_protocol: "http"
ipa_upstream_release: "master"
use_tinyipa: false
ipxe_efi_binary: ipxe.efi
ipxe_efi_binary: snponly.efi
tarballs_base_url: "https://tarballs.opendev.org/openstack/ironic-python-agent"
ipa_download_headers: {}

View File

@ -93,25 +93,6 @@
mode: "0644"
remote_src: true
# NOTE(TheJulia): Copy full iPXE chain loader images in case they are required.
- name: "Copy full iPXE image into {{ http_boot_folder }}/"
copy:
src: "{{ ipxe_dir }}/{{ ipxe_full_binary }}"
dest: "{{ http_boot_folder }}/"
owner: ironic
group: ironic
mode: "0644"
remote_src: true
- name: "Copy full iPXE image into {{ tftp_boot_folder }}"
copy:
src: "{{ ipxe_dir }}/{{ ipxe_full_binary }}"
dest: "{{ tftp_boot_folder }}"
owner: ironic
group: ironic
mode: "0644"
remote_src: true
- name: "Set grub2 and shim paths for Debian and Red Hat systems"
set_fact:
grub_efi_source: /usr/lib/ironic/grub-efi

View File

@ -1,7 +1,6 @@
---
init_dest_dir: /lib/systemd/system/
ipxe_dir: /usr/lib/ipxe/
ipxe_full_binary: ipxe.pxe
ironic_rootwrap_dir: /usr/local/bin/
mysql_service_name: mysql
tftp_service_name: tftpd-hpa

View File

@ -1,8 +1,7 @@
---
init_dest_dir: /usr/lib/systemd/system/
ipxe_dir: /usr/share/ipxe/
ipxe_full_binary: ipxe.lkrn
ipxe_efi_binary: ipxe-x86_64.efi
ipxe_efi_binary: ipxe-snponly-x86_64.efi
ironic_rootwrap_dir: /usr/bin/
mysql_service_name: mariadb
tftp_service_name: tftp

View File

@ -0,0 +1,10 @@
---
upgrade:
- |
Switches to using the *snponly* binary for iPXE on UEFI instead of the
default ``ipxe.efi``. This has been recommended by the Ironic project for
some time since ``snponly.efi`` generally has more stable networking
support. Change the ``ipxe_efi_binary`` variable to revert if needed.
- |
No longer installs the full iPXE binary (``ipxe.pxe``) that is not used by
Ironic.