Merge pull request #391 from stackhpc/upstream/master-2025-03-24

Synchronise master with upstream

Author: priteau

docker/base/Dockerfile.j2

@@ -263,7 +263,7 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
 
 RUN apt update \
  && apt install -y --no-install-recommends extrepo \
- && extrepo enable openstack_caracal \
+ && extrepo enable openstack_dalmatian \
  && apt purge -y extrepo \
  && apt --purge autoremove -y \
  && apt clean

docker/ironic/ironic-conductor/Dockerfile.j2

@@ -13,7 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'e2fsprogs',
         'fuse',
         'gdisk',
+        'genisoimage',
         'ipmitool',
+        'mtools',
         'openssh-clients',
         'parted',
         'psmisc',
@@ -22,7 +24,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'systemd-udev',
         'util-linux',
         'xfsprogs',
-        'genisoimage',
     ] %}
     {% if base_arch in ['x86_64'] %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
@@ -35,7 +36,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'dosfstools',
         'e2fsprogs',
         'gdisk',
+        'genisoimage',
         'ipmitool',
+        'isolinux',
+        'mtools',
         'openssh-client',
         'parted',
         'psmisc',
@@ -44,8 +48,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'shellinabox',
         'udev',
         'xfsprogs',
-        'genisoimage',
-        'isolinux',
     ] %}
 {% endif %}
 

docker/ironic/ironic-pxe/Dockerfile.j2

@@ -9,10 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set ironic_pxe_packages = [
+        'dosfstools',
         'grub2-tools',
         'grub2-efi-*64',
         'grub2-efi-aa64-modules',
         'ipxe-bootimgs',
+        'mtools',
         'shim-*64',
         'tftp-server',
     ] %}
@@ -26,8 +28,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
 {% elif base_package_type == 'deb' %}
     {% set ironic_pxe_packages = [
+        'dosfstools',
         'grub-efi-*64-signed',
         'ipxe',
+        'mtools',
         'pxelinux',
         'shim-signed',
         'syslinux-common',

docker/ironic/ironic-pxe/extend_start.sh

@@ -55,6 +55,35 @@ function prepare_ipxe {
     fi
 }
 
+function prepare_esp_image {
+    # NOTE(bbezak): based on https://docs.openstack.org/ironic/2024.2/install/configure-esp.html
+    # ESP image needs to be provided for UEFI boot with virtual media:
+    # https://docs.openstack.org/ironic/2024.2/admin/drivers/redfish.html#virtual-media-boot
+    if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+        shim_src_file="/usr/lib/shim/shim*64.efi.signed"
+        grub_src_file="/usr/lib/grub/*-efi-signed/grubnet*64.efi.signed"
+    elif [[ "${KOLLA_BASE_DISTRO}" =~ centos|rocky ]]; then
+        shim_src_file="/boot/efi/EFI/${KOLLA_BASE_DISTRO}/shim*64.efi"
+        grub_src_file="/boot/efi/EFI/${KOLLA_BASE_DISTRO}/grub*64.efi"
+    fi
+
+    if [[ "${KOLLA_BASE_ARCH}" == "x86_64" ]]; then
+        shim_dst_file="bootx64.efi"
+        grub_dst_file="grubx64.efi"
+    elif [[ "${KOLLA_BASE_ARCH}" == "aarch64" ]]; then
+        shim_dst_file="bootaa64.efi"
+        grub_dst_file="grubaa64.efi"
+    fi
+
+    DEST=${HTTPBOOT_PATH}/esp.img
+    dd if=/dev/zero of=$DEST bs=4096 count=2048
+    mkfs.msdos -F 12 -n ESP_IMAGE $DEST
+    mmd -i $DEST EFI EFI/BOOT
+    mcopy -i $DEST -v $shim_src_file ::EFI/BOOT/$shim_dst_file
+    mcopy -i $DEST -v $grub_src_file ::EFI/BOOT/$grub_dst_file
+    mdir -i $DEST ::EFI/BOOT
+}
+
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
@@ -63,6 +92,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     prepare_pxe_pxelinux
     prepare_pxe_grub
     prepare_ipxe
+    prepare_esp_image
     exit 0
 fi
 

docker/nova/nova-base/Dockerfile.j2

@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
     {% elif base_arch == 'aarch64' %}
         {% set nova_base_packages = nova_base_packages + [
-            'qemu-efi',
+            'qemu-efi-aarch64',
         ] %}
     {% endif %}
 

docker/nova/nova-compute/Dockerfile.j2

@@ -79,12 +79,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'xfsprogs'
     ] %}
 
-    {% if base_arch == "aarch64" %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'qemu-efi'
-        ] %}
-    {% endif %}
-
 RUN mkdir -p /etc/ceph \
     && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}
 

releasenotes/notes/debian-dalmatian-65fed830f10946e2.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Debian container image builds now use Dalmatian (2024.2) repositories
+    of Debian OpenStack.

releasenotes/notes/ironic-esp-image-886b5fb5b01e7b56.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ESP image needed for UEFI virtual media boot. More context in
+    `Ironic documentation
+    <https://docs.openstack.org/ironic/2024.2/admin/drivers/redfish.html#virtual-media-boot>`__.

releasenotes/notes/ironic-mtools-2938ccfe951f5dc5.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fixes ironic-conductor missing mtools package.

roles/kolla-build-deps/tasks/main.yml

@@ -62,3 +62,9 @@
     path: "{{ '/run/docker.sock' if container_engine == 'docker' else '/run/podman/podman.sock' }}"
     mode: "0666"
   become: true
+
+- name: Run multiarch/qemu-user-static image to support cross-arch build
+  ansible.builtin.command:
+    cmd: "{{ container_engine }} run --rm --privileged multiarch/qemu-user-static --reset -p yes"
+  become: true
+  when: ansible_facts.architecture != (base_arch | default('x86_64'))