summaryrefslogtreecommitdiffstats
path: root/meta-openstack/recipes-devtools/python/python-nova/nova.conf
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2014-03-24 13:18:45 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-03-25 09:56:15 -0400
commitdfc85232382af8fee180a83bd33f9d436557b774 (patch)
treeb6c2fc333b7ce925cab83111b206009ca0fb5a2d /meta-openstack/recipes-devtools/python/python-nova/nova.conf
parent809be55f0d276c59a8f71bb62f65fcdecede71b0 (diff)
downloadmeta-cloud-services-dfc85232382af8fee180a83bd33f9d436557b774.tar.gz
OpenStack: modify controller to be able to talk to both console
We modify the controller so that both vnc and spice html5 proxies are running. Since in the current recipe, both controller and compute share the same nova.conf file, in the compute, both vnc and spice html5 are set to enabled and in this configuration, vnc is chosen (in source: vnc is chosen because it's better tested). To change to spice, only change required is on the compute side. The controller (since the default console_type is auto) will try to talk to both and run whichever is available. Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova/nova.conf')
-rw-r--r--meta-openstack/recipes-devtools/python/python-nova/nova.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
index 42dc47a..d763a8b 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf
@@ -24,7 +24,7 @@ state_path=/var/run/nova/
24libvirt_images_type = %LIBVIRT_IMAGES_TYPE% 24libvirt_images_type = %LIBVIRT_IMAGES_TYPE%
25 25
26#VNC 26#VNC
27vnc_enabled = false 27vnc_enabled = True
28vncserver_listen = %COMPUTE_IP% 28vncserver_listen = %COMPUTE_IP%
29novncproxy_base_url=http://%CONTROLLER_IP%:6080/vnc_auto.html 29novncproxy_base_url=http://%CONTROLLER_IP%:6080/vnc_auto.html
30vncserver_proxyclient_address=%COMPUTE_IP% 30vncserver_proxyclient_address=%COMPUTE_IP%