openstack
/
kolla
Code Issues Proposed changes

Merge "Limit centos repo disable to centos hosts only"

This commit is contained in:
Zuul 2019-11-05 13:58:34 +00:00 committed by Gerrit Code Review
parent da4f15a7cf e4b37201a5
commit a7e8360f53
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/qdrouterd/Dockerfile.j2
View File

@ -16,8 +16,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qpid-dispatch-tools'
] %}
{% if base_distro in ['centos'] %}
# make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo
RUN {% if distro_package_manager == 'dnf' %}dnf config-manager{% else %}yum-config-manager{% endif %} --disable epel centos-release-opstools extras
{% endif %}
{{ macros.install_packages(qdrouterd_packages | customizable("packages")) }}