diff options
| author | Zuul <zuul@review.opendev.org> | 2025-04-28 11:29:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-04-28 11:29:56 +0000 |
| commit | aa44d7a9d1a57c8453cfa520b70110fad51e8464 (patch) | |
| tree | f82eba7d2d389164525e1ce77fb5471da86549ab | |
| parent | 2d4305737ea80ba4aa712e1aff3c6038af2cb3e1 (diff) | |
| parent | 80d931982a81cf3821249e077c21ed36d9d9b170 (diff) | |
| download | kolla-aa44d7a9d1a57c8453cfa520b70110fad51e8464.tar.gz kolla-aa44d7a9d1a57c8453cfa520b70110fad51e8464.zip | |
Merge "Fix preparation of /tftpboot for ironic-pxe"
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 5 | ||||
| -rw-r--r-- | releasenotes/notes/el-aarch64-ipxe-snponly-e7fc23bdc7edfe3d.yaml | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index 48504c6e6..07652b803 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -51,8 +51,11 @@ function prepare_ipxe { 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 - ln -s ${TFTPBOOT_PATH}/ipxe-${KOLLA_BASE_ARCH}.efi ${TFTPBOOT_PATH}/ipxe.efi + # 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 diff --git a/releasenotes/notes/el-aarch64-ipxe-snponly-e7fc23bdc7edfe3d.yaml b/releasenotes/notes/el-aarch64-ipxe-snponly-e7fc23bdc7edfe3d.yaml new file mode 100644 index 000000000..539a6886c --- /dev/null +++ b/releasenotes/notes/el-aarch64-ipxe-snponly-e7fc23bdc7edfe3d.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Ensure that ipxe-snponly-aarch64.efi is available in + /tftpboot in Centos and Rocky after bootstrapping + ironic-pxe. |