diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-06 17:58:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-06 17:58:28 +0000 |
| commit | 3ba4b45b3a88aaf51f76affea545fbf6ce20e820 (patch) | |
| tree | effe9d4daba62c86b9c339b181eae2e9ed54254d /docker | |
| parent | ae1cf2c88da6f467bb92e5360ec26d91146d1849 (diff) | |
| parent | 20801afaea3384eff064440b06039b70c115d891 (diff) | |
| download | kolla-3ba4b45b3a88aaf51f76affea545fbf6ce20e820.tar.gz kolla-3ba4b45b3a88aaf51f76affea545fbf6ce20e820.zip | |
Merge "Remove source install type for novnc / spice"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 20 |
2 files changed, 20 insertions, 11 deletions
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 }} |