diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/base/ci-centos.repo | 8 | ||||
| -rw-r--r-- | docker/base/ci-rocky.repo | 8 | ||||
| -rw-r--r-- | kolla/common/config.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml | 5 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 14 |
6 files changed, 32 insertions, 25 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 0bfebc81b..fa37d05ba 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -130,7 +130,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-openstack-bobcat', + 'centos-release-ceph-quincy', + 'centos-release-nfv-openvswitch', 'centos-release-opstools', 'epel-release', ] %} @@ -149,13 +150,24 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-quincy', '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 -%} diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo index e15954a9d..356cb9edc 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -53,14 +53,6 @@ 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 76fa85efc..e04f4cd8d 100644 --- a/docker/base/ci-rocky.repo +++ b/docker/base/ci-rocky.repo @@ -13,14 +13,6 @@ 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 9c2755f16..de50ce762 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -38,6 +38,10 @@ 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" @@ -262,7 +266,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=[], + cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS], 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 deleted file mode 100644 index 36282fa5a..000000000 --- a/releasenotes/notes/rdo-bobcat-dcd82366ea4aea04.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 f507cf619..cc968e290 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -50,6 +50,15 @@ 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 -%} @@ -104,7 +113,10 @@ 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 + fi; \ + sed -i \ + -e "s|{{ nodepool_rdo_proxy }}|https://trunk.rdoproject.org|g" \ + /etc/yum.repos.d/delorean*.repo {% 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|" \ |