openstack/kolla-ansible
Code Issues Proposed changes

Merge "Forces metadata to bind to single interface"

Browse Source
This commit is contained in:
Jenkins 2015-07-31 08:50:47 +00:00 committed by Gerrit Code Review
commit e93bb8ad7b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -66,6 +66,13 @@ listen nova_api
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_api_port }} check inter 2000 rise 2 fall 5
{% endfor %}
listen nova_metadata
# TODO(SamYaple): Make metadata port configurable throughout Ansible
bind {{ kolla_internal_address }}:8775
{% for host in groups['nova-api'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:8775 check inter 2000 rise 2 fall 5
{% endfor %}
listen neutron_server
bind {{ kolla_internal_address }}:{{ neutron_server_port }}
{% for host in groups['neutron-server'] %}

4
ansible/roles/nova/templates/nova.conf.j2
View File

@ -20,8 +20,10 @@ linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
compute_driver = libvirt.LibvirtDriver
allow_resize_to_same_host = true
vnc_enabled = true
my_ip = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
metadata_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
vnc_enabled = true
vncserver_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
vncserver_proxyclient_address = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
novncproxy_base_url = http://{{ kolla_internal_address }}:6080/vnc_auto.html