diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-02-26 10:06:28 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-26 13:46:04 +0000 |
| commit | 1fe8012ce2aec549430212d90ffd728889d6e4aa (patch) | |
| tree | ef5c5e9c6b2a82c43d4e4e6dbbfafe7f256ad34c /docker/gnocchi | |
| parent | 8e9a8e7aed54e798527fed04c3a21d0914b458fd (diff) | |
| download | kolla-1fe8012ce2aec549430212d90ffd728889d6e4aa.tar.gz kolla-1fe8012ce2aec549430212d90ffd728889d6e4aa.zip | |
Actually disable EPEL, and epel-modular
The disable_extra_repos macro accepts a list as its only argument. We
were calling it like this to disable EPEL:
disable_extra_repos('epel')
The macro interpreted this as a request to disable three repos, e, p, l.
Thanks Python! Type validation to be improved separately.
Additionally, on CentOS 8 the EPEL repository was not included in the
repository mapping file, repos.yaml. There is also another EPEL
repository on CentOS 8, epel-modular, which is enabled by default after
installing epel-release.
This change adds mappings for epel and epel-modular repos to repos.yaml,
and fixes the disabling of epel in the base image, as well as disabling
epel-modular.
There are some cases where EPEL is still used (it seemed a bit too
easy...), and the repository has been enabled for these images:
* bifrost-base (nginx)
* ironic-conductor (C7 only, shellinabox)
* freezer-base (C7 only, trickle)
* gnocchi-base (C8 binary only, python3-boto3)
* mariadb (pv)
* mongodb (C7 only, mongodb)
* nova-spicehtml5proxy (C7 only, spice-html5)
* telegraf (C7 only, python2-pip)
A few other things were changed:
* ironic-conductor does not require the ceph repo
* python3-pika is no longer installed in the openstack-base image
Related: blueprint remove-epel
Change-Id: I3761825239dfc462072383cde6276c4fb3e1bf12
Diffstat (limited to 'docker/gnocchi')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 6 |
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 = [ |