openstack/kolla
Code Issues Proposed changes

Remove ipxe code for Ubuntu Focal

Browse Source 
The ipxe package in Ubuntu Jammy includes snponly.efi [1]. Remove code
to handle Focal in which snponly.efi is absent from the ipxe package.

[1] https://packages.ubuntu.com/jammy/all/ipxe/filelist

Change-Id: I5f494de36e6400b5486c1fb786b73c9e1512a046
This commit is contained in:
Pierre Riteau 2023-02-15 09:08:59 +01:00
parent ca0238598a
commit 9da0d15189
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/ironic/ironic-pxe/extend_start.sh
View File

@ -43,14 +43,7 @@ function prepare_ipxe {
# was ipxe.efi. Ensure that both exist, using symlinks where the files are
# named differently to allow the original names to be used in ironic.conf.
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi} ${TFTPBOOT_PATH}/
# NOTE(mgoddard): The 'else' can be removed when snponly.efi is
# available in Jammy 22.04.
if [[ -f /usr/lib/ipxe/snponly.efi ]]; then
cp /usr/lib/ipxe/snponly.efi ${TFTPBOOT_PATH}/snponly.efi
elif [[ ! -e ${TFTPBOOT_PATH}/snponly.efi ]]; then
ln -s ${TFTPBOOT_PATH}/ipxe.efi ${TFTPBOOT_PATH}/snponly.efi
fi
cp /usr/lib/ipxe/{undionly.kpxe,ipxe.efi,snponly.efi} ${TFTPBOOT_PATH}/
elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]]; then
cp /usr/share/ipxe/{undionly.kpxe,ipxe*.efi} ${TFTPBOOT_PATH}/
if [[ ! -e ${TFTPBOOT_PATH}/ipxe.efi ]]; then