From 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 21 Jan 2019 12:58:19 -0700 Subject: Add python3 packages for RHEL systems RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support --- docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'docker/nova/nova-spicehtml5proxy') diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index 8003ac9b7..57b439766 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -9,11 +9,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set nova_spicehtml5proxy_packages = [ - 'numpy', 'openstack-nova-spicehtml5proxy', 'spice-html5' ] %} + {% if distro_python_version.startswith('3') %} + {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ + 'python3-numpy', + ] %} + {% else %} + {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [ + 'numpy', + ] %} + {% endif %} + {% elif base_package_type == 'deb' %} {% set nova_spicehtml5proxy_packages = [ -- cgit v1.2.3