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
... | ... |
@@ -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 |
--> |
... | ... |
@@ -88,6 +88,10 @@ GUEST_INTERFACE_DEFAULT=$(ip link \ |
88 | 88 |
| grep ^[ep] \ |
89 | 89 |
| head -1) |
90 | 90 |
|
91 |
+# $NOVA_VNC_ENABLED can be used to forcibly enable vnc configuration. |
|
92 |
+# In multi-node setups allows compute hosts to not run n-novnc. |
|
93 |
+NOVA_VNC_ENABLED=$(trueorfalse False $NOVA_VNC_ENABLED) |
|
94 |
+ |
|
91 | 95 |
# Get hypervisor configuration |
92 | 96 |
# ---------------------------- |
93 | 97 |
|
... | ... |
@@ -492,7 +496,7 @@ function create_nova_conf { |
492 | 492 |
iniset $NOVA_CONF spice html5proxy_base_url "$SPICEHTML5PROXY_URL" |
493 | 493 |
fi |
494 | 494 |
|
495 |
- if is_service_enabled n-novnc || is_service_enabled n-xvnc; then |
|
495 |
+ if is_service_enabled n-novnc || is_service_enabled n-xvnc || [ "$NOVA_VNC_ENABLED" != False ]; then |
|
496 | 496 |
# Address on which instance vncservers will listen on compute hosts. |
497 | 497 |
# For multi-host, this should be the management ip of the compute host. |
498 | 498 |
VNCSERVER_LISTEN=${VNCSERVER_LISTEN=127.0.0.1} |