diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-06 21:57:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-06 21:57:08 +0000 |
| commit | 44b5a8867ea987ff49689cd3f6281674304b7bb0 (patch) | |
| tree | 8a968f4a8ad8cdc9e9be8f48d605187e74861b2b /ansible/roles/haproxy | |
| parent | 4a1db7a08da47873c16530aea386447476cf140b (diff) | |
| parent | 99932d650d4c6cdc6ac88e3eab17c9f887fde193 (diff) | |
| download | kolla-44b5a8867ea987ff49689cd3f6281674304b7bb0.tar.gz kolla-44b5a8867ea987ff49689cd3f6281674304b7bb0.zip | |
Merge "Finish implementation of spice"
Diffstat (limited to 'ansible/roles/haproxy')
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index adc0096b9..e61c5d104 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -89,11 +89,19 @@ listen nova_metadata server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_metadata_port }} check inter 2000 rise 2 fall 5 {% endfor %} +{% if nova_console == 'novnc' %} listen nova_novncproxy bind {{ kolla_internal_address }}:{{ nova_novncproxy_port }} {% for host in groups['nova-novncproxy'] %} server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_novncproxy_port }} check inter 2000 rise 2 fall 5 {% endfor %} +{% elif nova_console == 'spice' %} +listen nova_spicehtml5proxy + bind {{ kolla_internal_address }}:{{ nova_spicehtml5proxy_port }} +{% for host in groups['nova-spicehtml5proxy'] %} + server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_spicehtml5proxy_port }} check inter 2000 rise 2 fall 5 +{% endfor %} +{% endif %} {% endif %} {% if enable_neutron | bool %} |
