diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-12-09 11:23:10 +0000 |
|---|---|---|
| committer | Paul Bourke (pbourke) <paul.bourke@oracle.com> | 2017-01-03 16:40:05 +0000 |
| commit | 20801afaea3384eff064440b06039b70c115d891 (patch) | |
| tree | d986ce30a5b8b361dc8abb6e773d103cee595503 | |
| parent | 2c887565d4299462a29b98210c2a7ce233e71039 (diff) | |
| download | kolla-20801afaea3384eff064440b06039b70c115d891.tar.gz kolla-20801afaea3384eff064440b06039b70c115d891.zip | |
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
| -rw-r--r-- | docker/nova/nova-novncproxy/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 20 | ||||
| -rwxr-xr-x | kolla/common/config.py | 8 |
3 files changed, 20 insertions, 19 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 }} diff --git a/kolla/common/config.py b/kolla/common/config.py index b08de9eed..65def7064 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -434,14 +434,6 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/nova/' 'nova-master.tar.gz')}, - 'nova-spicehtml5proxy': { - 'type': 'url', - 'location': ('http://github.com/SPICE/spice-html5/tarball/' - 'spice-html5-0.1.6')}, - 'nova-novncproxy': { - 'type': 'url', - 'location': ('http://github.com/kanaka/noVNC/tarball/' - 'v0.5.1')}, 'octavia-base': { 'type': 'url', 'location': ('http://tarballs.openstack.org/octavia/' |