diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-10 12:12:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-10 12:12:48 +0000 |
| commit | 34253adcb90e4812a5774cd5af388cc89c0265c6 (patch) | |
| tree | f5ef574372602b27fdccf9b5227177830923cf19 | |
| parent | b73d4d11eaa75bb0343a488220e75c697a2d1184 (diff) | |
| parent | 038074097727340e7a507a4693af0794797a849d (diff) | |
| download | kolla-34253adcb90e4812a5774cd5af388cc89c0265c6.tar.gz kolla-34253adcb90e4812a5774cd5af388cc89c0265c6.zip | |
Merge "centos: do not install CentOS Rabbitmq repo twice on AArch64"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 839dae24a..5ec3d2de3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -228,10 +228,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [ 'influxdb', ] %} -{% elif base_arch == 'aarch64' %} - {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ - 'centos-release-rabbitmq-38' - ] %} {% endif %} RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} |