diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 14:02:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 14:02:57 +0000 |
| commit | 2f66efdf5e2cef7cf5ca8b44759003c14a103ecf (patch) | |
| tree | 6f3a7cb6ac940ee6e376552250f4524ce9b9125b /docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | |
| parent | 4cbb9a5bfdd906c6ebc4c2fc5b0ac4431602bee4 (diff) | |
| parent | 53443c5c712f4ec23b859105e94bcd90abc27762 (diff) | |
| download | kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.tar.gz kolla-2f66efdf5e2cef7cf5ca8b44759003c14a103ecf.zip | |
Merge "Remove support for CentOS 7"
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy/Dockerfile.j2')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 9016ebe77..338b6d9ea 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -8,27 +8,16 @@ 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' %} {% set nova_spicehtml5proxy_packages = [ 'openstack-nova-spicehtml5proxy', - 'spice-html5' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ 'python3-numpy', + 'spice-html5' ] %} - {% else %} - {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ - 'numpy', - ] %} - {% endif %} {% elif base_package_type == 'deb' %} @@ -43,18 +32,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set nova_spicehtml5proxy_packages = [ - 'spice-html5' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ 'python3-numpy', + 'spice-html5' ] %} - {% else %} - {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ - 'numpy', - ] %} - {% endif %} {% elif base_package_type == 'deb' %} |