From 2ed66effa6e4a102919cb53a4b0737f852eb8674 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 25 Oct 2023 10:16:14 +0200
Subject: CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/900536

Change-Id: I1bc19f8198da3f9ab2ae2a8864c3349b21b0249e
---
 docker/base/Dockerfile.j2  | 16 ++--------------
 docker/base/ci-centos.repo |  8 ++++++++
 docker/base/ci-rocky.repo  |  8 ++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'docker')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index fa37d05ba..0bfebc81b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -130,8 +130,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
 ] %}
 
 {% set base_centos_yum_repo_packages = [
-    'centos-release-ceph-quincy',
-    'centos-release-nfv-openvswitch',
+    'centos-release-openstack-bobcat',
     'centos-release-opstools',
     'epel-release',
 ] %}
@@ -150,24 +149,13 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
     'centos-ceph-quincy',
     '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 -%}
diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo
index 356cb9edc..e15954a9d 100644
--- a/docker/base/ci-centos.repo
+++ b/docker/base/ci-centos.repo
@@ -53,6 +53,14 @@ enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
+[centos-openstack-bobcat]
+name=(OpenDev mirror) CentOS-$releasever - OpenStack Bobcat
+baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-bobcat/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+module_hotfixes=1
+
 [centos-opstools]
 name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
 baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
diff --git a/docker/base/ci-rocky.repo b/docker/base/ci-rocky.repo
index e04f4cd8d..76fa85efc 100644
--- a/docker/base/ci-rocky.repo
+++ b/docker/base/ci-rocky.repo
@@ -13,6 +13,14 @@ enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-NFV
 module_hotfixes=1
 
+[centos-openstack-bobcat]
+name=(OpenDev mirror) CentOS-$releasever - OpenStack Bobcat
+baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-bobcat/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
+module_hotfixes=1
+
 [centos-opstools]
 name=(OpenDev mirror) CentOS Stream $releasever - OpsTools - collectd
 baseurl=http://MIRROR/centos-stream/SIGs/$stream/opstools/$basearch/collectd-5/
-- 
cgit v1.2.3