diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-16 11:19:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-16 11:19:46 +0000 |
| commit | 2de75d4912e1544f49f7c37d6ea85c71bd3fe5f3 (patch) | |
| tree | ff4a0ebfbf53981f467295ff4760472e2df4050f /docker | |
| parent | 36406a59dc49f47cf0fdefa4dc8258392e8835db (diff) | |
| parent | 6b0dfb1f92a7d7da8d9f6e695313867cbbacd12b (diff) | |
| download | kolla-2de75d4912e1544f49f7c37d6ea85c71bd3fe5f3.tar.gz kolla-2de75d4912e1544f49f7c37d6ea85c71bd3fe5f3.zip | |
Merge "Build collectd image for CentOS8" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 5 |
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 %} |