diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index d7a2d3c8d..bb1c16e00 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -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: {} diff --git a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml index 19ada9940..86b4e0f04 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml @@ -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 diff --git a/playbooks/roles/bifrost-ironic-install/vars/debian.yml b/playbooks/roles/bifrost-ironic-install/vars/debian.yml index fe7153038..6c6f7ee46 100644 --- a/playbooks/roles/bifrost-ironic-install/vars/debian.yml +++ b/playbooks/roles/bifrost-ironic-install/vars/debian.yml @@ -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 diff --git a/playbooks/roles/bifrost-ironic-install/vars/redhat.yml b/playbooks/roles/bifrost-ironic-install/vars/redhat.yml index 3c7a045fe..c5ec50325 100644 --- a/playbooks/roles/bifrost-ironic-install/vars/redhat.yml +++ b/playbooks/roles/bifrost-ironic-install/vars/redhat.yml @@ -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 diff --git a/releasenotes/notes/snponly-7853afea1446a161.yaml b/releasenotes/notes/snponly-7853afea1446a161.yaml new file mode 100644 index 000000000..f808e16eb --- /dev/null +++ b/releasenotes/notes/snponly-7853afea1446a161.yaml @@ -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.