openstack/kolla-ansible
Code Issues Proposed changes

Merge "Source based builds should get novnc from tarball (git/url)"

Browse Source
This commit is contained in:
Jenkins
2015-09-02 09:32:12 +00:00
committed by Gerrit Code Review
parent 93b8d5b026 f24e80d7e6
commit 3493717517
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docker/nova/nova-novncproxy/Dockerfile.j2
View File

@@ -11,20 +11,11 @@ RUN yum -y install \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum -y install \
https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm \
novnc \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
ADD nova-novncproxy.tar / ADD nova-novncproxy.tar /
RUN ln -s /kanaka-noVNC-* /usr/share/novnc RUN ln -s /kanaka-noVNC-* /usr/share/novnc
{% endif %} {% endif %}
{% endif %}
COPY start.sh / COPY start.sh /
COPY config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/