From 2ed66effa6e4a102919cb53a4b0737f852eb8674 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 25 Oct 2023 10:16:14 +0200 Subject: [PATCH] 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 ++++++++ kolla/common/config.py | 6 +----- .../notes/rdo-bobcat-dcd82366ea4aea04.yaml | 5 +++++ tests/templates/template_overrides.j2 | 14 +------------- 6 files changed, 25 insertions(+), 32 deletions(-) create mode 100644 releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fa37d05bac..0bfebc81b6 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 356cb9edc2..e15954a9d2 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 e04f4cd8dc..76fa85efc5 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/ diff --git a/kolla/common/config.py b/kolla/common/config.py index de50ce7627..9c2755f16a 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -38,10 +38,6 @@ DISTRO_PRETTY_NAME = { } OPENSTACK_RELEASE = '2023.2' -# This is noarch repository so we will use it on all architectures -DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \ - "delorean-deps.repo" - # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source TARBALLS_BASE = "https://tarballs.opendev.org" @@ -266,7 +262,7 @@ _BASE_OPTS = [ help=('Set the package type of the distro. If not set then ' 'the packaging type is set to "rpm" if a RHEL based ' 'distro and "deb" if a Debian based distro.')), - cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS], + cfg.ListOpt('rpm_setup_config', default=[], help=('Comma separated list of .rpm or .repo file(s) ' 'or URL(s) to install before building containers')), cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')), diff --git a/releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml b/releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml new file mode 100644 index 0000000000..36282fa5ab --- /dev/null +++ b/releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + RHEL derivates images now use RDO Bobcat release for OpenStack services + dependencies. diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index cc968e2902..f507cf6198 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -50,15 +50,6 @@ RUN cd /etc/yum.repos.d/ && mkdir not-for-ci/ \ {% endif %} {# if centos/rocky #} {% raw %} -{% block base_centos_repo_overrides_post_rpm %} -{% endraw %} - -RUN sed -i \ - -e "s|https://trunk.rdoproject.org|{{ nodepool_rdo_proxy }}|g" \ - /etc/yum.repos.d/delorean*.repo - -{% raw %} -{% endblock %} {% block base_centos_repo_overrides_post_yum -%} {%- endraw -%} @@ -113,10 +104,7 @@ RUN if [ -d /etc/yum.repos.d/not-for-ci/ ]; then \ rm ci-{{ base_distro }}.repo && \ mv not-for-ci/*.repo . && \ rm -rf not-for-ci; \ - fi; \ - sed -i \ - -e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \ - /etc/yum.repos.d/delorean*.repo + fi {% elif base_distro == "debian" %} RUN sed -i -e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://deb.debian.org|" \ -e "s|\[trusted=yes\] http://{{ nodepool_mirror_host }}|http://security.debian.org|" \