diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-05-12 12:11:40 -0700 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-05-12 12:11:40 -0700 |
| commit | fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe (patch) | |
| tree | 3e29ea324d4bfe4be6f372d25df36c0dd78d4071 /docker/nova-compute | |
| parent | 57990a94aeac87e2ba5e25848215dcd4a0dbb9e3 (diff) | |
| download | kolla-fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe.tar.gz kolla-fa51eb4b5377e4725c0438fbfe85cdacdab8b3fe.zip | |
Fixes Nova NoVNC
Previously, vnc was not completely working properly because
nova.conf config flags were not properly implemented in t he correct
containers.
This patch moves the nova.conf config flags for vnc to the proper
containers. Additionally, the patch modifies the proxy client ip
param to be consistent with the param within nova.conf and adds
all the novnc params to docs.
Change-Id: I1944baca64ccd113bbca582784b08f90dc0eff69
Diffstat (limited to 'docker/nova-compute')
| -rwxr-xr-x | docker/nova-compute/nova-compute/config-nova-compute.sh | 8 |
1 files changed, 5 insertions, 3 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}" |