Merge "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Bobcat)"

1 files changed, 2 insertions, 14 deletions

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 -%}