openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Ensure that the vnc console is disabled when spice is enabled"

Browse Source
This commit is contained in:
Jenkins 2015-10-20 12:08:19 +00:00 committed by Gerrit Code Review
commit 505d457833
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/nova.conf.j2
View File

@ -129,6 +129,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 }}