aboutsummaryrefslogtreecommitdiff
path: root/docker/gnocchi
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-03-01 17:23:33 +0000
committerGerrit Code Review <review@openstack.org>2020-03-01 17:23:33 +0000
commitfecd325c67fb7700d86f682be57c1ef456ed7707 (patch)
tree5af4a45db86c6d37c5832d68970d8530b4962815 /docker/gnocchi
parent74d5a66e6bf744ad936d702443a8d64be86441ba (diff)
parent1fe8012ce2aec549430212d90ffd728889d6e4aa (diff)
downloadkolla-fecd325c67fb7700d86f682be57c1ef456ed7707.tar.gz
kolla-fecd325c67fb7700d86f682be57c1ef456ed7707.zip
Merge "Actually disable EPEL, and epel-modular"
Diffstat (limited to 'docker/gnocchi')
-rw-r--r--docker/gnocchi/gnocchi-base/Dockerfile.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2
index 4d23bd6aa..5ef69800e 100644
--- a/docker/gnocchi/gnocchi-base/Dockerfile.j2
+++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2
@@ -15,6 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %}
{% if install_type == 'binary' %}
+
+ {# NOTE(mgoddard): EPEL required for python3-boto3 package on CentOS 8 #}
+ {% if distro_package_manager == 'dnf' %}
+ {{ macros.enable_extra_repos(['epel']) }}
+ {% endif %}
+
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [