Merge pull request #407 from stackhpc/upstream/master-2025-05-05

Synchronise master with upstream

Author: priteau

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

docker/opensearch/opensearch/Dockerfile.j2

@@ -17,7 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 ENV OPENSEARCH_INITIAL_ADMIN_PASSWORD="Kolla24OpenSearch"
 
 {{ macros.install_packages(opensearch_packages | customizable("packages")) }} \
-    && chown -R opensearch:opensearch /usr/share/opensearch
+    && chown -R opensearch:opensearch /usr/share/opensearch \
+    && rm -f /etc/opensearch/*.pem \
+    && rm -f /etc/opensearch/securityadmin_demo.sh
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start

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.