openstack
/
kolla
Code Issues Proposed changes

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
This commit is contained in:
yatinkarel 2020-04-03 18:12:35 +05:30 committed by Radosław Piliszek
parent 169b3aa7c3
commit 34fce6c3d6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/collectd/Dockerfile.j2
View File

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