Merge "nova: add an option for no console"

ansible/roles/nova/templates/nova.conf.j2

@@ -84,6 +84,11 @@ html5proxy_base_url = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ nova_
 {% endif %}
 html5proxy_host = {{ api_interface_address }}
 html5proxy_port = {{ nova_spicehtml5proxy_port }}
+{% elif nova_console == 'none' %}
+[vnc]
+enabled = false
+[spice]
+enabled = false
 {% endif %}
 {% if enable_nova_serialconsole_proxy | bool %}
 [serial_console]

etc/kolla/globals.yml

@@ -133,7 +133,7 @@ kolla_internal_vip_address: "10.10.10.254"
 # Valid options are [ True, False ]
 #openstack_logging_debug: "False"
 
-# Valid options are [ novnc, spice, rdp ]
+# Valid options are [ none, novnc, spice, rdp ]
 #nova_console: "novnc"
 
 # OpenStack services can be enabled or disabled with these options