diff options
| author | Harm Weites <harm@weites.com> | 2015-05-05 00:37:23 +0200 |
|---|---|---|
| committer | Harm Weites <harm@weites.com> | 2015-05-06 22:32:38 +0200 |
| commit | 5ffc66cd69e1cda087056da25ab25548dacb1d32 (patch) | |
| tree | 180456a11c01670e6794078938ed38bd37af8fa2 /docker/nova-controller/nova-consoleauth | |
| parent | d19adb6a6b861147de3235c6867953d872e3aeec (diff) | |
| download | kolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.tar.gz kolla-5ffc66cd69e1cda087056da25ab25548dacb1d32.zip | |
Add a novnc container running the novnc-proxy.
All VNC-specific configuration bits are moved from nova-api-base to
nova-compute and the new nova-novncproxy and nova-consoleauth
containers. The compose specification has been updated to reflect this.
A future patch will make the desired backend configurable (spice/vnc).
Change-Id: I8b64abf125fd1ecd7d3463515e3717dd9bd60420
Blueprint: novnc-container
Diffstat (limited to 'docker/nova-controller/nova-consoleauth')
| -rw-r--r-- | docker/nova-controller/nova-consoleauth/Dockerfile | 8 | ||||
| l--------- | docker/nova-controller/nova-consoleauth/build | 1 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-consoleauth/start.sh | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/docker/nova-controller/nova-consoleauth/Dockerfile b/docker/nova-controller/nova-consoleauth/Dockerfile new file mode 100644 index 000000000..576c91b5a --- /dev/null +++ b/docker/nova-controller/nova-consoleauth/Dockerfile @@ -0,0 +1,8 @@ +FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base:%%KOLLA_TAG%% +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN yum -y install openstack-nova-console && yum clean all + +ADD start.sh /start.sh + +CMD ["/start.sh"] diff --git a/docker/nova-controller/nova-consoleauth/build b/docker/nova-controller/nova-consoleauth/build new file mode 120000 index 000000000..43944faa0 --- /dev/null +++ b/docker/nova-controller/nova-consoleauth/build @@ -0,0 +1 @@ +../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/nova-controller/nova-consoleauth/start.sh new file mode 100755 index 000000000..fbac5d4b5 --- /dev/null +++ b/docker/nova-controller/nova-consoleauth/start.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +. /opt/kolla/config-nova.sh + +cfg=/etc/nova/nova.conf + +check_required_vars NOVA_CONSOLEAUTH_LOG_FILE + +crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}" + +echo Starting nova-consoleauth +exec /usr/bin/nova-consoleauth |