diff options
| author | Zuul <zuul@review.opendev.org> | 2023-05-18 15:16:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-05-18 15:16:27 +0000 |
| commit | cfc05b7eb6a31e03ac86f984e228d4aa2ca4d8a2 (patch) | |
| tree | ba2e30459ca227c463f7c0a10194f8f020b7afe8 /docker/base/Dockerfile.j2 | |
| parent | 704d521d625ea74336226014c3b5d9b1cf597ac2 (diff) | |
| parent | 881e3925c7aa8c3bbe6897ea8790f109dc0a7fb8 (diff) | |
| download | kolla-cfc05b7eb6a31e03ac86f984e228d4aa2ca4d8a2.tar.gz kolla-cfc05b7eb6a31e03ac86f984e228d4aa2ca4d8a2.zip | |
Merge "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 37396012f..311a2917d 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -132,8 +132,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-antelope', 'centos-release-opstools', 'epel-release', ] %} @@ -152,24 +151,13 @@ 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', '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 -%} |