diff options
| author | Zuul <zuul@review.opendev.org> | 2023-10-24 16:16:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-10-24 16:16:23 +0000 |
| commit | e77002146990c6df2c961e07e1da41440fdab122 (patch) | |
| tree | b0809b892d8b3eed4c701d8483ff2c4ba147eebe /docker | |
| parent | bd2b69e6f82a62d08f40dffd53d279d1dedbc0b5 (diff) | |
| parent | 43d50b7c8b02f78af201b012021cb55c311b4346 (diff) | |
| download | kolla-e77002146990c6df2c961e07e1da41440fdab122.tar.gz kolla-e77002146990c6df2c961e07e1da41440fdab122.zip | |
Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean""
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, 14 insertions, 18 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 9dcd933d1..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-antelope', + '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 eef570772..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-antelope] -name=(OpenDev mirror) CentOS-$releasever - OpenStack Antelope -baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-antelope/ -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 0e456b0bd..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-antelope] -name=(OpenDev mirror) CentOS-$releasever - OpenStack Antelope -baseurl=http://MIRROR/centos-stream/SIGs/$stream/cloud/$basearch/openstack-antelope/ -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/ |