aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-04 07:01:41 +0000
committerGerrit Code Review <review@openstack.org>2016-10-04 07:01:41 +0000
commit3eac91d526058ad72d57c584246640fd56cded3c (patch)
tree964227478cc6be3b0cd49d2e852b50691802df5c
parent5fcb01d807e472e6c63599d17874a15c621d5096 (diff)
parentcfff7b09a84ac55159e54cd141c84602d9447f0a (diff)
downloadkolla-3eac91d526058ad72d57c584246640fd56cded3c.tar.gz
kolla-3eac91d526058ad72d57c584246640fd56cded3c.zip
Merge "Change mysql-check in HAProxy to post MySQL 4.1"
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index f95eeddf0..ae8526ee0 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -589,7 +589,7 @@ listen mariadb
mode tcp
option tcplog
option tcpka
- option mysql-check user haproxy
+ option mysql-check user haproxy post-41
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 %}