openstack
/
kolla
Code Issues Proposed changes

Merge "centos: do not install CentOS Rabbitmq repo twice on AArch64"

This commit is contained in:
Zuul 2021-05-10 12:12:48 +00:00 committed by Gerrit Code Review
parent b73d4d11ea 0380740977
commit 34253adcb9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -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) }}