openstack/kolla-ansible
Code Issues Proposed changes

Add nova_novncproxy port to haproxy configuration

Browse Source 
Make novncproxy_port configurable

Change-Id: I54f7918b1927562baf2e125b7f5c8edaec87e993
Closes-Bug: #1497673
This commit is contained in:
Hui Kang 2015-09-20 04:41:37 +00:00
parent 5e83b6d369
commit 83157d1a19
3 changed files with 11 additions and 1 deletions
ansible
group_vars
all.yml
roles
haproxy/templates
haproxy.cfg.j2
nova/templates
nova.conf.j2

1
ansible/group_vars/all.yml

@ -86,6 +86,7 @@ glance_registry_port: "9191"
nova_api_port: "8774" nova_api_port: "8774"
nova_api_ec2_port: "8773" nova_api_ec2_port: "8773"
nova_metadata_port: "8775" nova_metadata_port: "8775"
nova_novncproxy_port: "6080"
neutron_server_port: "9696" neutron_server_port: "9696"

6
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 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_metadata_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% 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 listen neutron_server
bind {{ kolla_internal_address }}:{{ neutron_server_port }} bind {{ kolla_internal_address }}:{{ neutron_server_port }}
{% for host in groups['neutron-server'] %} {% for host in groups['neutron-server'] %}

5
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_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'] }}
novncproxy_port = {{ nova_novncproxy_port }}
{% if inventory_hostname in groups['compute'] %} {% 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 %} {% endif %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]