diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-14 17:49:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-14 17:49:46 +0000 |
| commit | 354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9 (patch) | |
| tree | 52a9f8d3e6c20cc4ff769686d4b310561f67b272 /docker | |
| parent | b7d5053978e032498df0c2abc4be6ac56f0bdf7b (diff) | |
| parent | fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe (diff) | |
| download | kolla-354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9.tar.gz kolla-354ba01c8f5c7e1695cbea3bfc07aee5b75e76d9.zip | |
Merge "Fixes Nova NoVNC"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-compute/nova-compute/config-nova-compute.sh | 8 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-novncproxy/start.sh | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/nova-compute/nova-compute/config-nova-compute.sh index 14e18acc8..81a2e3fe3 100755 --- a/docker/nova-compute/nova-compute/config-nova-compute.sh +++ b/docker/nova-compute/nova-compute/config-nova-compute.sh @@ -5,15 +5,17 @@ cfg=/etc/nova/nova.conf -check_required_vars NOVA_NOVNC_PROXYCLIENT_IP +check_required_vars NOVA_VNCSERVER_PROXYCLIENT_ADDRESS NOVA_NOVNC_PROXY_PORT \ + NOVA_NOVNC_BASE_ADDRESS # 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. +# As such, NOVA_VNCSERVER_PROXYCLIENT_ADDRESS 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}" +crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_VNCSERVER_PROXYCLIENT_ADDRESS}" +crudini --set $cfg DEFAULT novncproxy_base_url "http://${NOVA_NOVNC_BASE_ADDRESS}:${NOVA_NOVNC_PROXY_PORT}/vnc_auto.html" # configure logging crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}" diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/nova-controller/nova-novncproxy/start.sh index e8aea8f79..9edafbca3 100755 --- a/docker/nova-controller/nova-novncproxy/start.sh +++ b/docker/nova-controller/nova-novncproxy/start.sh @@ -5,7 +5,8 @@ set -e cfg=/etc/nova/nova.conf check_required_vars PUBLIC_IP NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT \ - NOVA_NOVNC_BASE_ADDRESS + NOVA_NOVNC_BASE_ADDRESS NOVA_VNCSERVER_LISTEN_ADDRESS \ + NOVA_VNCSERVER_PROXYCLIENT_ADDRESS crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}" @@ -14,10 +15,8 @@ crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}" # The base_url is given to clients to connect to, like Horizon, so this could # very well be fancy DNS name. echo Configuring VNC... -crudini --set $cfg DEFAULT vnc_enabled "True" -crudini --set $cfg DEFAULT novncproxy_host "${NOVA_NOVNC_PROXY_SERVICE_HOST}" -crudini --set $cfg DEFAULT novncproxy_port "${NOVA_NOVNC_PROXY_PORT}" -crudini --set $cfg DEFAULT novncproxy_base_url "http://${NOVA_NOVNC_BASE_ADDRESS}:${NOVA_NOVNC_PROXY_PORT}/vnc_auto.html" +crudini --set $cfg DEFAULT vncserver_listen "${NOVA_VNCSERVER_LISTEN_ADDRESS}" +crudini --set $cfg DEFAULT vncserver_proxyclient_address "${NOVA_VNCSERVER_PROXYCLIENT_ADDRESS}" echo Starting nova-novncproxy exec /usr/bin/nova-novncproxy |