diff options
| author | yatinkarel <ykarel@redhat.com> | 2020-04-03 18:12:35 +0530 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-04-03 16:22:59 +0000 |
| commit | 34fce6c3d65eb7f31f0ecb08856f1f64a3db9ba5 (patch) | |
| tree | ba5182f102f495d6f0b6e6adc4643dad7cf26ea8 | |
| parent | 169b3aa7c3569194b33747403fee4535044885ff (diff) | |
| download | kolla-34fce6c3d65eb7f31f0ecb08856f1f64a3db9ba5.tar.gz kolla-34fce6c3d65eb7f31f0ecb08856f1f64a3db9ba5.zip | |
Collectd: ignore failure of disabling epel repos
https://review.opendev.org/#/c/710822/ added
disabling of epel and epel-modular repos.
There are cases when epel repos are not setup in
that case dnf config-manager will fail.
Let's ignore the failure in such cases.
This change is needed only for Train branch.
Partially-Implements: blueprint centos-rhel-8
Change-Id: I4aeb3971b82d461a305264490e829aaacfac9b24
| -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 |