Merge pull request #358 from stackhpc/upstream/2024.1-2024-10-03

Synchronise 2024.1 with upstream
stackhpc · Oct 3, 2024 · 773d1e0 · 773d1e0
2 parents 075a7dc + 7eb2f9e
commit 773d1e0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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

diff --git 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',