diff options
| author | Zuul <zuul@review.opendev.org> | 2025-03-31 11:42:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-03-31 11:42:45 +0000 |
| commit | 92f432548656a7bcc86f61fbbb09c42e09b3bd73 (patch) | |
| tree | a1ef3428a9be535325b3429d89444c307f52302d /docker | |
| parent | 78c5638f37683aecc404e96e32f3f0abb618d1bb (diff) | |
| parent | 16b3223d8c1e236edf498695786c960aef121db1 (diff) | |
| download | kolla-92f432548656a7bcc86f61fbbb09c42e09b3bd73.tar.gz kolla-92f432548656a7bcc86f61fbbb09c42e09b3bd73.zip | |
Merge "Add support for aarch64 ipxe to ironic-pxe image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index f4a7734f9..6a2131de6 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'grub2-efi-*64', 'grub2-efi-aa64-modules', 'ipxe-bootimgs', + 'ipxe-bootimgs-aarch64', 'mtools', 'shim-*64', 'tftp-server', diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index 54d6b1b21..48504c6e6 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -43,7 +43,12 @@ 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,snponly.efi} ${TFTPBOOT_PATH}/ + # 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/ + 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 |