From 6b0dfb1f92a7d7da8d9f6e695313867cbbacd12b Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Tue, 25 Feb 2020 17:28:37 +0530 Subject: 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) --- docker/collectd/Dockerfile.j2 | 5 ++++- kolla/image/build.py | 2 -- 2 files changed, 4 insertions(+), 3 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 %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 059e9b097..2bf968505 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -147,8 +147,6 @@ UNBUILDABLE_IMAGES = { 'centos8': { "almanach-base", # Dropped in master "ceph-base", # Missing Ceph repo - "collectd", # Missing collectd-ping and - # collectd-sensubility packages "dind", # Dropped in master "dragonflow-base", # Dropped in master "elasticsearch", # Missing elasticsearch repo -- cgit v1.2.3