diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-18 07:31:50 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-19 12:09:48 +0000 |
| commit | a7d4431928982a21740fd1459e08dede7178f1ab (patch) | |
| tree | ff9910a4de69bf06b02c1f3d457a28c7b4e30ea8 | |
| parent | 7ee4bb01c2b6fd9115c47b8022f28e19ddc32034 (diff) | |
| download | kolla-a7d4431928982a21740fd1459e08dede7178f1ab.tar.gz kolla-a7d4431928982a21740fd1459e08dede7178f1ab.zip | |
Add nova-spicehtml5proxy console
Change-Id: I0ca15e00ee52373b84f7021d86a29304526b7436
Partially-Implements: blueprint nova-proxies
| -rw-r--r-- | ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 | 11 | ||||
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | etc/kolla/kolla-build.conf | 8 |
3 files changed, 37 insertions, 0 deletions
diff --git a/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 new file mode 100644 index 000000000..aab421806 --- /dev/null +++ b/ansible/roles/nova/templates/nova-spicehtml5proxy.json.j2 @@ -0,0 +1,11 @@ +{ + "command": "/usr/bin/nova-spicehtml5proxy", + "config_files": [ + { + "source": "{{ container_config_directory }}/nova.conf", + "dest": "/etc/nova/nova.conf", + "owner": "nova", + "perm": "0600" + } + ] +} diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 new file mode 100644 index 000000000..2397e68d0 --- /dev/null +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -0,0 +1,18 @@ +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN echo 'ERROR: The specified distro has no Kolla images to build: "{{ base_distro }}"' \ + && /bin/false + + {% endif %} +{% elif install_type == 'source' %} + +ADD nova-spicehtml5proxy-archive /usr/share/nova-spicehtml5proxy-source +RUN cd /usr/share && ln -s nova-spicehtml5proxy-source/* spice-html5 + +{% endif %} + +{{ include_footer }} diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf index fd603b41a..5203a9174 100644 --- a/etc/kolla/kolla-build.conf +++ b/etc/kolla/kolla-build.conf @@ -113,6 +113,14 @@ location = http://tarballs.openstack.org/neutron/neutron-master.tar.gz type = url location = http://tarballs.openstack.org/nova/nova-master.tar.gz +[nova-spicehtml5proxy] +## freedesktop.org has the latest untagged code and should be prefered for git +# type = git +# location = http://anongit.freedesktop.org/git/spice/spice-html5.git +# reference = master +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 |