openstack/charm-nova-compute
Code Issues Proposed changes

Revert console config from grizzly template as it will be out of support by the time these branches land and grizzly does not support spice

Browse Source
This commit is contained in:
Liam Young 2014-07-10 09:17:19 +00:00
parent 5bafcb92bb
commit 6d11ac3e67
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
templates/grizzly/nova.conf
View File

@ -36,18 +36,6 @@ rbd_user = {{ rbd_user }}
rbd_secret_uuid = {{ rbd_secret_uuid }} rbd_secret_uuid = {{ rbd_secret_uuid }}
{% endif -%} {% endif -%}
{% if console_access_protocol == 'spice' -%}
vnc_enabled = False
novnc_enabled = False
{% elif console_access_protocol == 'novnc' -%}
vnc_enabled = True
novnc_enabled = True
vncserver_proxyclient_address = {{ local_spice_addr }}
vncserver_listen = 0.0.0.0
novncproxy_base_url = {{ console_proxy_address }}
keymap = {{ console_keymap }}
{% endif -%}
{% if neutron_plugin and neutron_plugin == 'ovs' -%} {% if neutron_plugin and neutron_plugin == 'ovs' -%}
libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
{% if neutron_security_groups -%} {% if neutron_security_groups -%}
@ -92,12 +80,3 @@ live_migration_uri = {{ live_migration_uri }}
instances_path = {{ instances_path }} instances_path = {{ instances_path }}
{% endif -%} {% endif -%}
{% if console_access_protocol == 'spice' -%}
[spice]
agent_enabled = True
enabled = True
html5proxy_base_url = {{ console_proxy_address }}
keymap = {{ console_keymap }}
server_listen = 0.0.0.0
server_proxyclient_address = {{ local_spice_addr }}
{% endif -%}