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
This commit is contained in:
Paul Bourke 2016-12-09 11:23:10 +00:00 committed by Paul Bourke (pbourke)
parent 2c887565d4
commit 20801afaea
3 changed files with 20 additions and 19 deletions

View File

@ -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 }}

View File

@ -23,15 +23,25 @@ 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 %}

View File

@ -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/'