From 113a4be0f291e01e51cd1bdda47208bcf49998bb Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 19 Oct 2015 20:23:08 +0100
Subject: [PATCH] Ensure that the vnc console is disabled when spice is enabled

The spice and vnc consoles are mutually exclusive with Horizon set
to auto-detect the console type. It is also clear from the
configuration method that the designed implementation is to deploy
only one of them.

This patch ensures that only one is enabled at a time by explicitly
disabling the vnc console (which defaults to enabled).

Change-Id: Ib0368d3d6125e4abe7f9a9c40748457fc0d349f2
---
 templates/nova.conf.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index a7257e63..ee4d2ba5 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -130,6 +130,9 @@ html5proxy_base_url = {{ nova_spice_html5proxy_base_url }}
 server_listen = {{ nova_management_address }}
 server_proxyclient_address = {{ nova_management_address }}
 
+[vnc]
+enabled = False
+
 {% elif nova_console_type == 'novnc' %}
 [vnc]
 enabled = {{ nova_novncproxy_agent_enabled }}