diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-01 17:23:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-01 17:23:33 +0000 |
| commit | fecd325c67fb7700d86f682be57c1ef456ed7707 (patch) | |
| tree | 5af4a45db86c6d37c5832d68970d8530b4962815 /docker/nova | |
| parent | 74d5a66e6bf744ad936d702443a8d64be86441ba (diff) | |
| parent | 1fe8012ce2aec549430212d90ffd728889d6e4aa (diff) | |
| download | kolla-fecd325c67fb7700d86f682be57c1ef456ed7707.tar.gz kolla-fecd325c67fb7700d86f682be57c1ef456ed7707.zip | |
Merge "Actually disable EPEL, and epel-modular"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index b5da34c12..fce71702e 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -5,6 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{# NOTE(mgoddard): EPEL required for spice-html5 package. Not provided by EPEL8 #} +{% if distro_package_manager == 'yum' %} +{{ macros.enable_extra_repos(['epel']) }} +{% endif %} + {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} |