From db0f87d3c8e1e7eccdeb1ea46216d530711680d3 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 7 Oct 2024 11:37:25 +0200 Subject: CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Dalmatian) Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/933312 Change-Id: I0ce9e907594fd160a08ad7929d5bc4bca9abf536 --- docker/base/Dockerfile.j2 | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index ee7cb9570..bb61c8307 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -129,8 +129,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-ceph-reef', - 'centos-release-nfv-openvswitch', + 'centos-release-openstack-dalmatian', 'centos-release-opstools', 'epel-release', ] %} @@ -149,24 +148,13 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-reef', 'centos-nfv-openvswitch', 'centos-opstools', - 'centos9-nfv-ovs', - 'centos9-opstools', - 'centos9-rabbitmq', - 'centos9-storage', + 'centos-rabbitmq-38', '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