diff options
| author | Zuul <zuul@review.opendev.org> | 2024-10-25 08:12:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-10-25 08:12:05 +0000 |
| commit | fcff57b200dcaa58b1edc4db6d778461c76e488a (patch) | |
| tree | 8bc5f70069952dff5bc364c72d1ea0090df3a246 /docker | |
| parent | 7ee20ff1104380fde7f42e5941a883425939c296 (diff) | |
| parent | db0f87d3c8e1e7eccdeb1ea46216d530711680d3 (diff) | |
| download | kolla-fcff57b200dcaa58b1edc4db6d778461c76e488a.tar.gz kolla-fcff57b200dcaa58b1edc4db6d778461c76e488a.zip | |
Merge "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Dalmatian)"19.0.0.0rc1
Diffstat (limited to 'docker')
| -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 |
3 files changed, 18 insertions, 14 deletions
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 -%} diff --git a/docker/base/ci-centos.repo b/docker/base/ci-centos.repo index a8decf252..9a3fb3109 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-dalmatian] +name=(OpenDev mirror) CentOS-$releasever - OpenStack Dalmatian +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-dalmatian/ +gpgcheck=1 +enabled=1 +gpgkey=https://www.centos.org/keys/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 3daf5c5ba..9b9945040 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-dalmatian] +name=(OpenDev mirror) CentOS-$releasever - OpenStack Dalmatian +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-dalmatian/ +gpgcheck=1 +enabled=1 +gpgkey=https://www.centos.org/keys/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/ |