From 20801afaea3384eff064440b06039b70c115d891 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Fri, 9 Dec 2016 11:23:10 +0000 Subject: Remove source install type for novnc / spice Currently Kolla only offers source installs for OpenStack projects. The novnc and spice images have been consistent with this resulting in tarballs being pulled from github. The binary/source distinction should be removed for these images. Change-Id: Ibdf593a2a164e39bba3ea2a0e6333f2de876c2a0 --- docker/nova/nova-novncproxy/Dockerfile.j2 | 11 +++++------ docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'docker') diff --git a/docker/nova/nova-novncproxy/Dockerfile.j2 b/docker/nova/nova-novncproxy/Dockerfile.j2 index 7aa8c4657..19a861458 100644 --- a/docker/nova/nova-novncproxy/Dockerfile.j2 +++ b/docker/nova/nova-novncproxy/Dockerfile.j2 @@ -21,17 +21,16 @@ MAINTAINER {{ maintainer }} {% endif %} -{{ macros.install_packages(nova_novncproxy_packages | customizable("packages")) }} - {% elif install_type == 'source' %} -ADD nova-novncproxy-archive /usr/share/nova-novncproxy-source -RUN cd /usr/share \ - && ln -s nova-novncproxy-source/* novnc \ - && chown -R nova: /usr/share/nova-novncproxy-source + {% set nova_novncproxy_packages = [ + 'novnc' + ] %} {% endif %} +{{ macros.install_packages(nova_novncproxy_packages | customizable("packages")) }} + {% block nova_novncproxy_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index f11bab9db..913d33e45 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -23,16 +23,26 @@ MAINTAINER {{ maintainer }} {% endif %} -{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} - {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source -RUN cd /usr/share \ - && ln -s nova-spicehtml5proxy-source/* spice-html5 + {% set nova_spicehtml5proxy_packages = [ + 'spice-html5', + 'numpy' + ] %} + + {% elif base_distro in ['ubuntu'] %} + {% set nova_spicehtml5proxy_packages = [ + 'spice-html5', + 'websockify' + ] %} + + {% endif %} {% endif %} +{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} + {% block nova_spicehtml5proxy_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} -- cgit v1.2.3