aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles/haproxy
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-10 05:56:41 +0000
committerSam Yaple <sam@yaple.net>2015-08-13 02:27:38 +0000
commitcf3fd4043aebbd9a60c6e501e9e8be09ce4bf565 (patch)
treef87f0ba8321b76ada842fbabc2c1e722b94f7f07 /ansible/roles/haproxy
parenta0a859ac9281dc28e7e0e2d3ae002b068af6f706 (diff)
downloadkolla-cf3fd4043aebbd9a60c6e501e9e8be09ce4bf565.tar.gz
kolla-cf3fd4043aebbd9a60c6e501e9e8be09ce4bf565.zip
Update mariadb confs and ports
Cleanup all options in galera.cnf. Bind to all interfaces and ports appropriately. Change-Id: I516613d09673ba61aadda2c7bbb4abbbe4ea47ac Partially-Implements: blueprint update-configs Closes-Bug: #1478330
Diffstat (limited to 'ansible/roles/haproxy')
-rw-r--r--ansible/roles/haproxy/templates/haproxy.cfg.j28
1 files changed, 3 insertions, 5 deletions
diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
index 57a2ab542..257989bd3 100644
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2
@@ -16,13 +16,11 @@ defaults
listen mariadb
mode tcp
- option mysql-check user haproxy
option tcpka
-
- # TODO(SamYaple): Make DB port configurable throughout Ansible
- bind {{ kolla_internal_address }}:3306
+ option mysql-check user haproxy
+ bind {{ kolla_internal_address }}:{{ mariadb_port }}
{% for host in groups['mariadb'] %}
- server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:3306 check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %}
+ server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + api_interface]['ipv4']['address'] }}:{{ mariadb_port }} check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %}
{% endfor %}