Browse code

Merge "Add and document $NOVA_VNC_ENABLED for forcing VNC on"

Jenkins authored on 2014/08/27 13:13:05
Showing 2 changed files
... ...
@@ -184,7 +184,13 @@ SERVICE_HOST=192.168.42.11
184 184
 MYSQL_HOST=192.168.42.11
185 185
 RABBIT_HOST=192.168.42.11
186 186
 GLANCE_HOSTPORT=192.168.42.11:9292
187
-ENABLED_SERVICES=n-cpu,n-net,n-api,c-sch,c-api,c-vol</pre>
187
+ENABLED_SERVICES=n-cpu,n-net,n-api,c-sch,c-api,c-vol
188
+NOVA_VNC_ENABLED=True
189
+NOVNCPROXY_URL="http://192.168.42.11:6080/vnc_auto.html"
190
+VNCSERVER_LISTEN=$HOST_IP
191
+VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
192
+</pre>
193
+
188 194
 <!-- save for vlan
189 195
 FLAT_INTERFACE=eth0.926
190 196
 -->
... ...
@@ -84,6 +84,10 @@ GUEST_INTERFACE_DEFAULT=$(ip link \
84 84
     | grep ^[ep] \
85 85
     | head -1)
86 86
 
87
+# $NOVA_VNC_ENABLED can be used to forcibly enable vnc configuration.
88
+# In multi-node setups allows compute hosts to not run n-novnc.
89
+NOVA_VNC_ENABLED=$(trueorfalse False $NOVA_VNC_ENABLED)
90
+
87 91
 # Get hypervisor configuration
88 92
 # ----------------------------
89 93
 
... ...
@@ -485,7 +489,7 @@ function create_nova_conf {
485 485
         iniset $NOVA_CONF spice html5proxy_base_url "$SPICEHTML5PROXY_URL"
486 486
     fi
487 487
 
488
-    if is_service_enabled n-novnc || is_service_enabled n-xvnc; then
488
+    if is_service_enabled n-novnc || is_service_enabled n-xvnc || [ "$NOVA_VNC_ENABLED" != False ]; then
489 489
         # Address on which instance vncservers will listen on compute hosts.
490 490
         # For multi-host, this should be the management ip of the compute host.
491 491
         VNCSERVER_LISTEN=${VNCSERVER_LISTEN=127.0.0.1}