aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/haproxy
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-10 05:02:25 +0000
committerSam Yaple <sam@yaple.net>2015-08-10 05:02:25 +0000
commit3a78bbdef03470278ee4844543e5bf0d4b4fb95b (patch)
tree7313346df445e9a953694003e0b0759f459476a8 /ansible/roles/haproxy
parent96b8d86ca51c8c2c0576e827b548bf0f50c8a097 (diff)
downloadkolla-3a78bbdef03470278ee4844543e5bf0d4b4fb95b.tar.gz
kolla-3a78bbdef03470278ee4844543e5bf0d4b4fb95b.zip
Update rabbitmq confs and ports
Cleanup all options in the rabbitmq confs. Allow all ports to be configurable. Change-Id: I9b3b485a4f3a25d20c0f19d13638f717daa169dc Partially-Implements: blueprint update-configs
Diffstat (limited to 'ansible/roles/haproxy')
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j210
1 files changed, 7 insertions, 3 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 11a334099..236af7d85 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -29,11 +29,15 @@ listen mariadb
listen rabbitmq
mode tcp
option tcpka
+ bind {{ kolla_internal_address }}:{{ rabbitmq_port }}
+{% for host in groups['rabbitmq'] %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rabbitmq_port }} check inter 2000 rise 2 fall 5
+{% endfor %}
- # TODO(SamYaple): Make rabbitmq port configurable throughout Ansible
- bind {{ kolla_internal_address }}:5672
+listen rabbitmq_management
+ bind {{ kolla_internal_address }}:{{ rabbitmq_management_port }}
{% for host in groups['rabbitmq'] %}
- server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:5672 check inter 2000 rise 2 fall 5
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ rabbitmq_management_port }} check inter 2000 rise 2 fall 5
{% endfor %}
listen keystone_public