aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy/Dockerfile.j2')
-rw-r--r--docker/nova/nova-spicehtml5proxy/Dockerfile.j224
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' %}