aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-compute
diff options
context:
space:
mode:
authorHarm Weites <harm@weites.com>2015-05-05 00:37:23 +0200
committerHarm Weites <harm@weites.com>2015-05-06 22:32:38 +0200
commit5ffc66cd69e1cda087056da25ab25548dacb1d32 (patch)
tree180456a11c01670e6794078938ed38bd37af8fa2 /docker/nova-compute
parentd19adb6a6b861147de3235c6867953d872e3aeec (diff)
downloadkolla-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-compute')
-rwxr-xr-xdocker/nova-compute/nova-compute/config-nova-compute.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/nova-compute/nova-compute/config-nova-compute.sh
index cb1b01fa1..14e18acc8 100755
--- a/docker/nova-compute/nova-compute/config-nova-compute.sh
+++ b/docker/nova-compute/nova-compute/config-nova-compute.sh
@@ -5,6 +5,16 @@
cfg=/etc/nova/nova.conf
+check_required_vars NOVA_NOVNC_PROXYCLIENT_IP
+
+# Configures novnc to listen on all interfaces and instructs nova-compute to
+# announce PROXYCLIENT_IP to the nova-vncproxy. Clients like Horizon will
+# connect with this address.
+# As such, PROXYCLIENT_IP is unique per compute node.
+crudini --set $cfg DEFAULT vnc_enabled "True"
+crudini --set $cfg DEFAULT vncserver_listen "0.0.0.0"
+crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_NOVNC_PROXYCLIENT_IP}"
+
# configure logging
crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}"