aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-novncproxy
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2016-12-09 11:23:10 +0000
committerPaul Bourke (pbourke) <paul.bourke@oracle.com>2017-01-03 16:40:05 +0000
commit20801afaea3384eff064440b06039b70c115d891 (patch)
treed986ce30a5b8b361dc8abb6e773d103cee595503 /docker/nova/nova-novncproxy
parent2c887565d4299462a29b98210c2a7ce233e71039 (diff)
downloadkolla-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
Diffstat (limited to 'docker/nova/nova-novncproxy')
-rw-r--r--docker/nova/nova-novncproxy/Dockerfile.j211
1 files changed, 5 insertions, 6 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 }}