diff options
| author | Sagi Shnaidman <sshnaidm@redhat.com> | 2019-11-05 12:49:42 +0200 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-11-06 10:16:50 +0000 |
| commit | 4a97f3507aca21c73d09624bb48307b39d66a10f (patch) | |
| tree | 03420ad8ce2ed22033adad0d633d2f57ae6c21cb /docker/qdrouterd | |
| parent | 6b17bb2d3658ee5fccfc9e69f1ab1278a2452a29 (diff) | |
| download | kolla-4a97f3507aca21c73d09624bb48307b39d66a10f.tar.gz kolla-4a97f3507aca21c73d09624bb48307b39d66a10f.zip | |
Limit centos repo disable to centos hosts only
Run dnf or yum to disable centos repos only if used on centos
machine.
Closes-Bug: #1851135
Change-Id: If6f05237c2512c643857765eecf452f5416b3d60
(cherry picked from commit e4b37201a596dbe242887ba51d7092eaed11a0cf)
Diffstat (limited to 'docker/qdrouterd')
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 6b31af541..e1b3322b2 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -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")) }} |