diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-01-10 14:14:28 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2023-01-13 12:00:51 +0100 |
| commit | a8732d80fb020743fd72a2b68092df1b5c93bc02 (patch) | |
| tree | 2abf601f7bf853bd85050cc030314c99679e5be3 /docker | |
| parent | f07ecbbab2842348adf2b93b045be87e7fa5a85e (diff) | |
| download | kolla-a8732d80fb020743fd72a2b68092df1b5c93bc02.tar.gz kolla-a8732d80fb020743fd72a2b68092df1b5c93bc02.zip | |
CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean
Zed was released, landed in CentOS repo, time to use it.
Change-Id: I829a0fc4439281b074c40e200d96a27584da3765
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 2d9ade3c9..cad81cc39 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -148,8 +148,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-zed', 'centos-release-opstools', 'epel-release', ] %} @@ -168,22 +167,11 @@ 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', ] %} -{% 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..f32d1dedf 100644 --- a/docker/base/ci-centos.repo +++ b/docker/base/ci-centos.repo @@ -67,6 +67,14 @@ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging +[centos-openstack-zed] +name=(OpenDev mirror) CentOS-$releasever - OpenStack zed +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-zed/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud +module_hotfixes=1 + [epel] name=(OpenDev mirror) Extra Packages for Enterprise Linux $releasever - $basearch baseurl=http://MIRROR/epel/$releasever/Everything/$basearch/ diff --git a/docker/base/ci-rocky.repo b/docker/base/ci-rocky.repo index e04f4cd8d..2b1c05d1b 100644 --- a/docker/base/ci-rocky.repo +++ b/docker/base/ci-rocky.repo @@ -27,6 +27,14 @@ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Messaging +[centos-openstack-zed] +name=(OpenDev mirror) CentOS-$releasever - OpenStack zed +baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-zed/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud +module_hotfixes=1 + [epel] name=(OpenDev mirror) Extra Packages for Enterprise Linux $releasever - $basearch baseurl=http://MIRROR/epel/$releasever/Everything/$basearch/ |