openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source 
Source based centos, fedora and oraclelinux install novnc via
rdo repository while ubuntu and debian get novnc from github.
oraclelinux source build cannot use rdo, also using novnc tarballs
can be expanded to all distros.

Change-Id: I236dd5c36380e0592fceae4f4e1c28fe97dec1e7
Closes-Bug: #1490893
This commit is contained in:
Vladislav Belogrudov 2015-09-01 12:28:40 +03:00
parent 6668900e71
commit f24e80d7e6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,19 +11,10 @@ RUN yum -y install \
{% endif %}
{% 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 /
RUN ln -s /kanaka-noVNC-* /usr/share/novnc
{% endif %}
{% endif %}
COPY start.sh /