openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use external address in novncproxy and spice"

Browse Source
This commit is contained in:
Jenkins 2016-02-22 19:14:06 +00:00 committed by Gerrit Code Review
commit e6263dcd09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ novncproxy_port = {{ nova_novncproxy_port }}
vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
vncserver_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} vncserver_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% if inventory_hostname in groups['compute'] %} {% if inventory_hostname in groups['compute'] %}
novncproxy_base_url = {{ internal_protocol }}://{{ kolla_internal_address }}:{{ nova_novncproxy_port }}/vnc_auto.html novncproxy_base_url = {{ public_protocol }}://{{ kolla_external_address }}:{{ nova_novncproxy_port }}/vnc_auto.html
{% endif %} {% endif %}
{% elif nova_console == 'spice' %} {% elif nova_console == 'spice' %}
[vnc] [vnc]
@ -69,7 +69,7 @@ enabled = false
server_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} server_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
server_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} server_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% if inventory_hostname in groups['compute'] %} {% if inventory_hostname in groups['compute'] %}
html5proxy_base_url = {{ internal_protocol }}://{{ kolla_internal_address }}:{{ nova_spicehtml5proxy_port }}/spice_auto.html html5proxy_base_url = {{ public_protocol }}://{{ kolla_external_address }}:{{ nova_spicehtml5proxy_port }}/spice_auto.html
{% endif %} {% endif %}
html5proxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} html5proxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
html5proxy_port = {{ nova_spicehtml5proxy_port }} html5proxy_port = {{ nova_spicehtml5proxy_port }}