aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-novncproxy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-06 17:58:28 +0000
committerGerrit Code Review <review@openstack.org>2017-01-06 17:58:28 +0000
commit3ba4b45b3a88aaf51f76affea545fbf6ce20e820 (patch)
treeeffe9d4daba62c86b9c339b181eae2e9ed54254d /docker/nova/nova-novncproxy
parentae1cf2c88da6f467bb92e5360ec26d91146d1849 (diff)
parent20801afaea3384eff064440b06039b70c115d891 (diff)
downloadkolla-3ba4b45b3a88aaf51f76affea545fbf6ce20e820.tar.gz
kolla-3ba4b45b3a88aaf51f76affea545fbf6ce20e820.zip
Merge "Remove source install type for novnc / spice"
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 }}