diff options
| author | Zuul <zuul@review.opendev.org> | 2026-01-22 15:08:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-01-22 15:08:56 +0000 |
| commit | 800dfaebf02126f8751e3f5aa85569d0c9f5a2a4 (patch) | |
| tree | 18e019dfca17080cfac4b31219975d9b0eccbae4 /docker | |
| parent | 641179db88b65a606951f5f1555dd7908a3e2442 (diff) | |
| parent | 900fd8002a6a6538d48127e232b9ac0ba4499b99 (diff) | |
| download | kolla-800dfaebf02126f8751e3f5aa85569d0c9f5a2a4.tar.gz kolla-800dfaebf02126f8751e3f5aa85569d0c9f5a2a4.zip | |
Merge "Fix ironic-pxe syslinux-tftpboot on aarch64 Rocky Linux"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 6a2131de6..eb357610b 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -17,15 +17,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ipxe-bootimgs-aarch64', 'mtools', 'shim-*64', + 'syslinux-tftpboot', 'tftp-server', ] %} - {% if base_arch in ['x86_64'] %} - {% set ironic_pxe_packages = ironic_pxe_packages + [ - 'syslinux-tftpboot' - ] %} - {% endif %} - {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }} {% elif base_package_type == 'deb' %} {% set ironic_pxe_packages = [ |