diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-27 22:18:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-27 22:18:23 +0000 |
| commit | d038ac7cdea95b176e311324261756df8e22a3fa (patch) | |
| tree | 31e56d2445757f1003360186b35adf27cdb703bb | |
| parent | 25020d1c58dea59cf1337c5968fadd11e79fdbae (diff) | |
| parent | e26751b95505ce43aaef6c264ab03b755ab79d77 (diff) | |
| download | kolla-d038ac7cdea95b176e311324261756df8e22a3fa.tar.gz kolla-d038ac7cdea95b176e311324261756df8e22a3fa.zip | |
Merge "Remove MariaDB warning from HAproxy"
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index 3bd8cc8fd..79915d778 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -36,19 +36,6 @@ listen stats stats realm Haproxy\ Stats stats auth {{ haproxy_user }}:{{ haproxy_password }} -{% if enable_mariadb | bool %} -listen mariadb - mode tcp - option tcplog - option tcpka - option mysql-check user haproxy - bind {{ kolla_internal_vip_address }}:{{ mariadb_port }} -{% for host in groups['mariadb'] %} - server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mariadb_port }} check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %} - -{% endfor %} -{% endif %} - {% if enable_rabbitmq | bool %} listen rabbitmq_management bind {{ kolla_internal_vip_address }}:{{ rabbitmq_management_port }} @@ -393,3 +380,33 @@ listen elasticsearch server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ elasticsearch_port }} check inter 2000 rise 2 fall 5 {% endfor %} {% endif %} + +# (NOTE): This defaults section deletes forwardfor as recomended by: +# https://marc.info/?l=haproxy&m=141684110710132&w=1 + +defaults + log global + mode http + option redispatch + option httplog + retries 3 + timeout http-request 10s + timeout queue 1m + timeout connect 10s + timeout client 1m + timeout server 1m + timeout check 10s + +{% if enable_mariadb | bool %} +listen mariadb + mode tcp + option tcplog + option tcpka + option mysql-check user haproxy + bind {{ kolla_internal_vip_address }}:{{ mariadb_port }} +{% for host in groups['mariadb'] %} + server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mariadb_port }} check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %} + +{% endfor %} +{% endif %} + |