From 4537f2b5348879515d639716526bfb67c695bb9a Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 3 Oct 2024 12:45:37 +0200 Subject: [PATCH 1/2] aarch64: fix name of rabbitmq copr repo it should be the same as in repos.yaml Change-Id: Ieb413f7a4bd1989d7f29309368b6b218d1395e0b (cherry picked from commit 672601a3e66c2d818c30192bebaf4229ae468aa1) --- docker/base/copr-rabbitmq-erlang.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/base/copr-rabbitmq-erlang.repo b/docker/base/copr-rabbitmq-erlang.repo index 9b998eadc8..17608e5334 100644 --- a/docker/base/copr-rabbitmq-erlang.repo +++ b/docker/base/copr-rabbitmq-erlang.repo @@ -2,7 +2,7 @@ # from https://github.com/rabbitmq/erlang-rpm/ # Thanks to COPR we have aarch64 packages for CentOS Stream 9 -[openstack-kolla-copr-rabbitmq-kolla] +[copr-rabbitmq-erlang] name=openstack-kolla COPR with Erlang build for RabbitMQ baseurl=https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang/centos-stream-$releasever-aarch64/ gpgcheck=1 From 97a6d193be081d4d37e38db7d0dd8b4fafcb961e Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 3 Oct 2024 13:00:25 +0200 Subject: [PATCH 2/2] aarch64: Exclude syslinux from ironic conductor packages The 'syslinux' package is not available on aarch64, so it is only included in the ironic conductor packages for x86_64 systems. Related-Bug: #1749780 Change-Id: I3eea308a0a70e47dd3b185eece106185b25616f5 (cherry picked from commit 7b4913e6f8ee64c462727ee495a3bc8522331f91) --- docker/ironic/ironic-conductor/Dockerfile.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 6ccc2c1011..8d3d3c7afe 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -23,8 +23,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'util-linux', 'xfsprogs', 'genisoimage', - 'syslinux', ] %} + {% if base_arch in ['x86_64'] %} + {% set ironic_conductor_packages = ironic_conductor_packages + [ + 'syslinux' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set ironic_conductor_packages = [ 'bsdmainutils',