diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-22 19:14:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-22 19:14:06 +0000 |
| commit | e6263dcd09e7a19b6d1a3c8dc1a7fcf82583eb8b (patch) | |
| tree | 720a2c97c53b5dcee28373e9f0a5866c665e61b4 | |
| parent | 3678532f349844267bb5045f9ac766a09902830e (diff) | |
| parent | 64a3ac84339a863ed172a171fdcb4fe8ce23d7a1 (diff) | |
| download | kolla-e6263dcd09e7a19b6d1a3c8dc1a7fcf82583eb8b.tar.gz kolla-e6263dcd09e7a19b6d1a3c8dc1a7fcf82583eb8b.zip | |
Merge "Use external address in novncproxy and spice"
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index b872f343d..e2f89d33a 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -59,7 +59,7 @@ novncproxy_port = {{ nova_novncproxy_port }} vncserver_listen = {{ 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'] %} -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 %} {% elif nova_console == 'spice' %} [vnc] @@ -69,7 +69,7 @@ enabled = false server_listen = {{ 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'] %} -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 %} html5proxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} html5proxy_port = {{ nova_spicehtml5proxy_port }} |