diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 09e062e322..3a4419723b 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -86,6 +86,7 @@ glance_registry_port: "9191" nova_api_port: "8774" nova_api_ec2_port: "8773" nova_metadata_port: "8775" +nova_novncproxy_port: "6080" neutron_server_port: "9696" diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 71a7f45aa6..21cd6261d8 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -88,6 +88,12 @@ 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 %} +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 %} + listen neutron_server bind {{ kolla_internal_address }}:{{ neutron_server_port }} {% for host in groups['neutron-server'] %} diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 9ea09b9ce3..79f0e0fbb0 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -35,8 +35,11 @@ my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['add vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} vncserver_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} + +novncproxy_port = {{ nova_novncproxy_port }} + {% if inventory_hostname in groups['compute'] %} -novncproxy_base_url = http://{{ kolla_internal_address }}:6080/vnc_auto.html +novncproxy_base_url = http://{{ kolla_internal_address }}:{{ nova_novncproxy_port }}/vnc_auto.html {% endif %} [oslo_messaging_rabbit]