diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 14:16:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 14:16:57 +0000 |
| commit | 9963f0a1ef115cb3b7c103e3dccb7755b79f3168 (patch) | |
| tree | df6cc58a33ee7d10a23280c7ac9b3c5b144984a4 | |
| parent | 24639c58fa983b2b2a752c5fa3e33d37200060f2 (diff) | |
| parent | 83157d1a19df7cb9b856cff74264e9464431eaf8 (diff) | |
| download | kolla-9963f0a1ef115cb3b7c103e3dccb7755b79f3168.tar.gz kolla-9963f0a1ef115cb3b7c103e3dccb7755b79f3168.zip | |
Merge "Add nova_novncproxy port to haproxy configuration"
| -rw-r--r-- | ansible/group_vars/all.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 09e062e32..3a4419723 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 71a7f45aa..21cd6261d 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 9ea09b9ce..79f0e0fbb 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] |