diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-21 19:42:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-21 19:42:13 +0000 |
| commit | 3ddc0b9820767a7ddbc9acc9e39357272fd3aa33 (patch) | |
| tree | 44ec684b058ee6cfef7ccdd260e222e7053b9da3 /docker/collectd | |
| parent | 16e0fb9b860d1608f7ac6fdb949251ca73c34730 (diff) | |
| parent | 2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7 (diff) | |
| download | kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.tar.gz kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.zip | |
Merge "centos: disable EPEL by default"
Diffstat (limited to 'docker/collectd')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index a3cc0747b..2f251c5fc 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -88,10 +88,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% endif %} - {% if distro_package_manager == 'yum' %} -# make sure, collectd is pulled from centos-opstools -RUN yum-config-manager --disable epel - {% endif %} {% endif %} {{ macros.install_packages(collectd_packages | customizable("packages")) }} |
