diff options
| author | Sagi Shnaidman <sshnaidm@redhat.com> | 2019-11-04 12:35:46 +0200 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-11-06 10:15:47 +0000 |
| commit | 6b17bb2d3658ee5fccfc9e69f1ab1278a2452a29 (patch) | |
| tree | a7d31c6998e94d0b8827a5cee5cf40cf6466225e /docker | |
| parent | afff258522c7aab966237ad0c55f9cd73f7a6f17 (diff) | |
| download | kolla-6b17bb2d3658ee5fccfc9e69f1ab1278a2452a29.tar.gz kolla-6b17bb2d3658ee5fccfc9e69f1ab1278a2452a29.zip | |
Fix centos qdrouterd for centos > 7
Yum doesn't present in centos/rhel version 8, we'll need to
use dnf in that case.
Change-Id: I2ccbfe4ae55c6a3653d8c03a12e6bca64e58d396
Closes-Bug: #1851135
(cherry picked from commit 31a061099b0c518fc43ded1e1a675ad257b6d57d)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 19ce0755b..6b31af541 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} # make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo -RUN yum-config-manager --disable epel centos-release-opstools extras +RUN {% if distro_package_manager == 'dnf' %}dnf config-manager{% else %}yum-config-manager{% endif %} --disable epel centos-release-opstools extras {{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} |