openstack
/
kolla
Code Issues Proposed changes

Merge "Build collectd image for CentOS8" into stable/train

This commit is contained in:
Zuul 2020-03-16 11:19:46 +00:00 committed by Gerrit Code Review
parent 36406a59dc 6b0dfb1f92
commit 2de75d4912
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/collectd/Dockerfile.j2
View File

@ -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 %}

2
kolla/image/build.py
View File

@ -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