diff options
| author | Zuul <zuul@review.opendev.org> | 2024-12-11 10:05:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-12-11 10:05:02 +0000 |
| commit | 33f5eb260bf1828bca83344bf9de654c1577e0be (patch) | |
| tree | 16f5f03c23fc07ce3117637d1f46232f90fed7fc /docker/base/Dockerfile.j2 | |
| parent | f57457f90631634e92829ba149233fb3b1e929f9 (diff) | |
| parent | 08a97807be4a4ba20c7897c82407ca87df53dee3 (diff) | |
| download | kolla-33f5eb260bf1828bca83344bf9de654c1577e0be.tar.gz kolla-33f5eb260bf1828bca83344bf9de654c1577e0be.zip | |
Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Dalmatian)""
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8b31e196a..fc6e1683a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -128,7 +128,8 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ ] %} {% set base_centos_yum_repo_packages = [ - 'centos-release-openstack-dalmatian', + 'centos-release-ceph-reef', + 'centos-release-nfv-openvswitch', 'centos-release-opstools', 'epel-release', ] %} @@ -147,13 +148,24 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-reef', '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 -%} |