From 08a97807be4a4ba20c7897c82407ca87df53dee3 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 29 Nov 2024 11:03:57 +0000 Subject: Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Dalmatian)" This reverts commit db0f87d3c8e1e7eccdeb1ea46216d530711680d3. Reason for revert: Epoxy cycle is on Change-Id: Ie2a747223b33039684650bede8863af0c8906d2f --- docker/base/Dockerfile.j2 | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index bb61c8307..ee7cb9570 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -129,7 +129,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-openstack-dalmatian', + 'centos-release-ceph-reef', + 'centos-release-nfv-openvswitch', 'centos-release-opstools', 'epel-release', ] %} @@ -148,13 +149,24 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-reef', 'centos-nfv-openvswitch', 'centos-opstools', - 'centos-rabbitmq-38', + 'centos9-nfv-ovs', + 'centos9-opstools', + 'centos9-rabbitmq', + 'centos9-storage', 'epel', 'influxdb', 'opensearch-2.x', 'opensearch-dashboards-2.x', ] %} +{% if base_arch == 'aarch64' %} + +{# NOTE(hrw): delorean-deps.repo may force x86-64 repos #} + +RUN sed -i -e "s/x86_64/aarch64/g" /etc/yum.repos.d/delorean-deps.repo + +{% endif %} + RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} {%- for repo in base_centos_yum_repos_to_enable | customizable('centos_yum_repos_to_enable') %} && dnf config-manager --enable {{ repo }} {% endfor -%} -- cgit v1.2.3