From e4b37201a596dbe242887ba51d7092eaed11a0cf Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Tue, 5 Nov 2019 12:49:42 +0200 Subject: [PATCH] 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 --- docker/qdrouterd/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 6b31af541f..e1b3322b25 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")) }}