Skip to content

Synchronise 2025.1 with upstream #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 3 commits into from
Aug 10, 2026
Merged

Synchronise 2025.1 with upstream #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
547d31c
ironic-pxe: don't fail if symlinks already exist
owenjones Jul 10, 2026
0994217
Don't build releaser image on Rocky
osfrickler Aug 4, 2026
662eebd
Merge "ironic-pxe: don't fail if symlinks already exist" into stable/…
Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions docker/ironic/ironic-pxe/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,16 @@ function prepare_ipxe {
# NOTE(m-anson): ipxe-arm64.efi is not symlinked from /boot to
# /usr/lib/ipxe by the Ubuntu ipxe package, so fix that here.
if [[ -e /boot/ipxe-arm64.efi ]]; then
ln -s /boot/ipxe-arm64.efi /usr/lib/ipxe/
ln -sf /boot/ipxe-arm64.efi /usr/lib/ipxe/
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}/
cp /usr/share/ipxe/arm64-efi/snponly.efi ${TFTPBOOT_PATH}/ipxe-snponly-aarch64.efi
if [[ ! -e ${TFTPBOOT_PATH}/ipxe.efi ]]; then
# NOTE(m-anson): No ipxe-aarch64.efi exists so no need to use
# $KOLLA_BASE_ARCH in the symlink target
ln -s ${TFTPBOOT_PATH}/ipxe-x86_64.efi ${TFTPBOOT_PATH}/ipxe.efi
fi
if [[ ! -e ${TFTPBOOT_PATH}/snponly.efi ]]; then
ln -s ${TFTPBOOT_PATH}/ipxe-snponly-${KOLLA_BASE_ARCH}.efi ${TFTPBOOT_PATH}/snponly.efi
fi
# NOTE(m-anson): No ipxe-aarch64.efi exists so no need to use
# $KOLLA_BASE_ARCH in the symlink target
ln -sf ${TFTPBOOT_PATH}/ipxe-x86_64.efi ${TFTPBOOT_PATH}/ipxe.efi
ln -sf ${TFTPBOOT_PATH}/ipxe-snponly-${KOLLA_BASE_ARCH}.efi ${TFTPBOOT_PATH}/snponly.efi
fi
}

Expand Down
1 change: 1 addition & 0 deletions kolla/image/unbuildable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
},

'rocky+9': {
"releaser", # releases repo no longer supports py3.9
},

'rocky+10': {
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/ironic-pxe-symlinks-18d09b19373f16c4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes ``ironic_pxe`` launch failures when symlinks to EFI files have
previously been created.
`LP#2160317 <https://launchpad.net/bugs/2160317>`__