aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-spicehtml5proxy
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-12-17 13:01:42 +0000
committerMark Goddard <mark@stackhpc.com>2020-01-29 11:41:38 +0000
commit4b4e26262b9e03190c639481fb60a8f4f92c532a (patch)
treea1e6a6404e006a620c98ac8a37b3eec3f1ae250b /docker/nova/nova-spicehtml5proxy
parentbdb0dbddbc30215169baaaa263c583e7d3183607 (diff)
downloadkolla-4b4e26262b9e03190c639481fb60a8f4f92c532a.tar.gz
kolla-4b4e26262b9e03190c639481fb60a8f4f92c532a.zip
CentOS 8: Update packages in images
* Some further changes for python2 vs python3 packages * Allow rabbitmq 3.7.*, since a newer erlang is available * Switch from qemu-img-ev to qemu-img on CentOS 8 * bridge-utils no longer available on CentOS 8 * libvirt-daemon-driver-lxc no longer available on CentOS 8 * Mark some more images buildable for CentOS 8 Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08 Partially-Implements: blueprint centos-rhel-8 Partially-Implements: blueprint centos-rhel-python-3
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
-rw-r--r--docker/nova/nova-spicehtml5proxy/Dockerfile.j211
1 files changed, 10 insertions, 1 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 57b439766..b5da34c12 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -36,10 +36,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set nova_spicehtml5proxy_packages = [
- 'numpy',
'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 = [