aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/haproxy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-12 20:22:37 +0000
committerGerrit Code Review <review@openstack.org>2015-08-12 20:22:37 +0000
commit15f058d2438465e87005103a258b91c4c35fb960 (patch)
treeaeccdd981824980ec01ed9d2267e0ddfb9b0f4a6 /ansible/roles/haproxy
parent15041bd4cc9a1d1ff64f1a394c11bcc37cb496b6 (diff)
parentd91346377efa5d551bde6de3ace35e9d889d5364 (diff)
downloadkolla-15f058d2438465e87005103a258b91c4c35fb960.tar.gz
kolla-15f058d2438465e87005103a258b91c4c35fb960.zip
Merge "Update nova.conf and ports"
Diffstat (limited to 'ansible/roles/haproxy')
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j211
1 files changed, 8 insertions, 3 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 6f4c685f9..57a2ab542 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -70,11 +70,16 @@ 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_api_ec2
+ bind {{ kolla_internal_address }}:{{ nova_api_ec2_port }}
+{% for host in groups['nova-api'] %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_api_ec2_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
+ bind {{ kolla_internal_address }}:{{ nova_metadata_port }}
{% 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
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ nova_metadata_port }} check inter 2000 rise 2 fall 5
{% endfor %}
listen neutron_server