diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-07 12:39:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-07 12:39:11 +0000 |
| commit | 5782c74672dad91050a052b586d2ed9b26a423e6 (patch) | |
| tree | 3939bf416011553c465b755230b2b50b21af9b40 /docker | |
| parent | 39661541c42b469532a606ccb4e442977728dfc6 (diff) | |
| parent | 34fce6c3d65eb7f31f0ecb08856f1f64a3db9ba5 (diff) | |
| download | kolla-5782c74672dad91050a052b586d2ed9b26a423e6.tar.gz kolla-5782c74672dad91050a052b586d2ed9b26a423e6.zip | |
Merge "Collectd: ignore failure of disabling epel repos" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 418a1a9e7..f4447ff2b 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -85,7 +85,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% if distro_package_manager == 'dnf' %} # make sure, collectd is pulled from centos-opstools -RUN dnf config-manager --disable epel epel-modular +RUN dnf config-manager --disable epel epel-modular || true {% elif distro_package_manager == 'yum' %} # make sure, collectd is pulled from centos-opstools RUN yum-config-manager --disable epel |