aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-25 08:05:04 +0000
committerGerrit Code Review <review@openstack.org>2016-09-25 08:05:04 +0000
commit276d9b0a48920f40e025436a7bc317e9824be402 (patch)
tree525f7dc411fa1c706cb549acd5d85fe6aff4efe6
parent238add741868f3602428fab8e9c21ef3b4f51907 (diff)
parent23aae451632b76a0fa769c33be2a1db2a4141d8c (diff)
downloadkolla-276d9b0a48920f40e025436a7bc317e9824be402.tar.gz
kolla-276d9b0a48920f40e025436a7bc317e9824be402.zip
Merge "Add aodh-api to haproxy.cfg file"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j216
1 files changed, 16 insertions, 0 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index f6eb60a3e..a0594e11e 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -517,6 +517,22 @@ listen ceilometer_api_external
{% endif %}
{% endif %}
+{% if enable_aodh | bool %}
+listen aodh_api
+ bind {{ kolla_internal_vip_address }}:{{ aodh_api_port }}
+{% for host in groups['aodh-api'] %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ aodh_api_port }} check inter 2000 rise 2 fall 5
+{% endfor %}
+{% if haproxy_enable_external_vip | bool %}
+
+listen aodh_api_external
+ bind {{ kolla_external_vip_address }}:{{ aodh_api_port }} {{ tls_bind_info }}
+{% for host in groups['aodh-api'] %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ aodh_api_port }} check inter 2000 rise 2 fall 5
+{% endfor %}
+{% endif %}
+{% endif %}
+
# (NOTE): This defaults section deletes forwardfor as recomended by:
# https://marc.info/?l=haproxy&m=141684110710132&w=1