summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authoryatinkarel <ykarel@redhat.com>2020-02-25 17:28:37 +0530
committerMark Goddard <mark@stackhpc.com>2020-03-13 09:22:36 +0000
commit6b0dfb1f92a7d7da8d9f6e695313867cbbacd12b (patch)
tree33a62c62b3d84a7f6f4e02c8ecba9b6c5e0904d1 /docker
parent3470dc8199f36b2956b75bb2720cd73d207d8701 (diff)
downloadkolla-6b0dfb1f92a7d7da8d9f6e695313867cbbacd12b.tar.gz
kolla-6b0dfb1f92a7d7da8d9f6e695313867cbbacd12b.zip
Build collectd image for CentOS8
Required packages are available in RDO repo, so this should build fine. Partially-Implements: blueprint centos-rhel-8 Change-Id: I14cc9d0f2c5d72c6dad89de2ac6dcffda8510285 (cherry picked from commit 2089165388c6da609973d9083f40b163382dbcc3)
Diffstat (limited to 'docker')
-rw-r--r--docker/collectd/Dockerfile.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index ff237f543..418a1a9e7 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -83,7 +83,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% endif %}
{% endif %}
- {% if distro_package_manager == 'yum' %}
+ {% if distro_package_manager == 'dnf' %}
+# make sure, collectd is pulled from centos-opstools
+RUN dnf config-manager --disable epel epel-modular
+ {% elif distro_package_manager == 'yum' %}
# make sure, collectd is pulled from centos-opstools
RUN yum-config-manager --disable epel
{% endif %}