diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-05 13:58:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-05 13:58:34 +0000 |
| commit | a7e8360f53d3daebc4991970898eaa3cfdd4f1e5 (patch) | |
| tree | 6b03d327643a3b052fd120ec761206678f831e65 | |
| parent | da4f15a7cfbc183fafe2d718027d0bccd760a5f0 (diff) | |
| parent | e4b37201a596dbe242887ba51d7092eaed11a0cf (diff) | |
| download | kolla-a7e8360f53d3daebc4991970898eaa3cfdd4f1e5.tar.gz kolla-a7e8360f53d3daebc4991970898eaa3cfdd4f1e5.zip | |
Merge "Limit centos repo disable to centos hosts only"
| -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")) }} |