Skip to content

Commit

Permalink
Add and document $NOVA_VNC_ENABLED for forcing VNC on
Browse files Browse the repository at this point in the history
This allows multinode setups to function correctly without enabling the
unneeded n-novnc and n-xvnc services on pure compute nodes.

Change-Id: Ie02734bb598d27560cf5d674c9e1d9b8dca3801f
Closes-Bug: 1342155
  • Loading branch information
frozencemetery committed Aug 20, 2014
1 parent 58f8f42 commit 4e07fdc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 7 additions & 1 deletion docs/source/guides/multinode-lab.html
Expand Up @@ -184,7 +184,13 @@ <h3>Configure Compute Nodes</h3>
MYSQL_HOST=192.168.42.11
RABBIT_HOST=192.168.42.11
GLANCE_HOSTPORT=192.168.42.11:9292
ENABLED_SERVICES=n-cpu,n-net,n-api,c-sch,c-api,c-vol</pre>
ENABLED_SERVICES=n-cpu,n-net,n-api,c-sch,c-api,c-vol
NOVA_VNC_ENABLED=True
NOVNCPROXY_URL="http://192.168.42.11:6080/vnc_auto.html"
VNCSERVER_LISTEN=$HOST_IP
VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
</pre>

<!-- save for vlan
FLAT_INTERFACE=eth0.926
-->
Expand Down
6 changes: 5 additions & 1 deletion lib/nova
Expand Up @@ -88,6 +88,10 @@ GUEST_INTERFACE_DEFAULT=$(ip link \
| grep ^[ep] \
| head -1)

# $NOVA_VNC_ENABLED can be used to forcibly enable vnc configuration.
# In multi-node setups allows compute hosts to not run n-novnc.
NOVA_VNC_ENABLED=$(trueorfalse False $NOVA_VNC_ENABLED)

# Get hypervisor configuration
# ----------------------------

Expand Down Expand Up @@ -492,7 +496,7 @@ function create_nova_conf {
iniset $NOVA_CONF spice html5proxy_base_url "$SPICEHTML5PROXY_URL"
fi

if is_service_enabled n-novnc || is_service_enabled n-xvnc; then
if is_service_enabled n-novnc || is_service_enabled n-xvnc || [ "$NOVA_VNC_ENABLED" != False ]; then
# Address on which instance vncservers will listen on compute hosts.
# For multi-host, this should be the management ip of the compute host.
VNCSERVER_LISTEN=${VNCSERVER_LISTEN=127.0.0.1}
Expand Down

0 comments on commit 4e07fdc

Please sign in to comment.