openstack/kolla-ansible
Code Issues Proposed changes

Fix vnc_enabled warning

Browse Source 
Remove option vnc_enabled from group default.
Add option enabled in group vnc.

Change-Id: Ia48b335fd9d160b53bc2ec98b7e3bc5b89b9c553
Closes-Bug: #1695181
This commit is contained in:
shaofeng_cheng 2017-06-02 15:13:23 +08:00
parent e972a45d99
commit 10531d71e4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/nova/templates/nova.conf.j2
View File

@ -24,7 +24,6 @@ scheduler_host_manager = ironic_host_manager
host={{ ansible_hostname }}-ironic host={{ ansible_hostname }}-ironic
log_file = /var/log/kolla/nova/nova-compute-ironic.log log_file = /var/log/kolla/nova/nova-compute-ironic.log
compute_driver = ironic.IronicDriver compute_driver = ironic.IronicDriver
vnc_enabled = False
ram_allocation_ratio = 1.0 ram_allocation_ratio = 1.0
reserved_host_memory_mb = 0 reserved_host_memory_mb = 0
{% elif enable_nova_fake | bool %} {% elif enable_nova_fake | bool %}
@ -60,6 +59,9 @@ workers = {{ openstack_service_workers }}
{% if nova_console == 'novnc' %} {% if nova_console == 'novnc' %}
[vnc] [vnc]
{% if service_name == "nova-compute-ironic" %}
enabled = false
{% else %}
novncproxy_host = {{ api_interface_address }} novncproxy_host = {{ api_interface_address }}
novncproxy_port = {{ nova_novncproxy_port }} novncproxy_port = {{ nova_novncproxy_port }}
vncserver_listen = {{ api_interface_address }} vncserver_listen = {{ api_interface_address }}
@ -67,6 +69,7 @@ vncserver_proxyclient_address = {{ api_interface_address }}
{% if inventory_hostname in groups['compute'] %} {% if inventory_hostname in groups['compute'] %}
novncproxy_base_url = {{ public_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}kolla_kubernetes_external_vip{% else %}{{ kolla_external_fqdn }}{% endif %}:{{ nova_novncproxy_port }}/vnc_auto.html novncproxy_base_url = {{ public_protocol }}://{% if orchestration_engine == 'KUBERNETES' %}kolla_kubernetes_external_vip{% else %}{{ kolla_external_fqdn }}{% endif %}:{{ nova_novncproxy_port }}/vnc_auto.html
{% endif %} {% endif %}
{% endif %}
{% elif nova_console == 'spice' %} {% elif nova_console == 'spice' %}
[vnc] [vnc]
# We have to turn off vnc to use spice # We have to turn off vnc to use spice