Merge "Fix HAProxy check for MariaDB"

This commit is contained in:
Zuul 2019-08-22 10:33:14 +00:00 committed by Gerrit Code Review
commit e25d915dd9
2 changed files with 11 additions and 2 deletions

View File

@ -13,7 +13,8 @@ mariadb_services:
mariadb:
enabled: "{{ enable_mariadb|bool and not enable_external_mariadb_load_balancer|bool }}"
mode: "tcp"
port: "{{ mariadb_port }}"
port: "{{ database_port }}"
listen_port: "{{ mariadb_port }}"
frontend_tcp_extra:
- "option clitcpka"
- "timeout client 3600s"
@ -25,7 +26,8 @@ mariadb_services:
mariadb_external_lb:
enabled: "{{ enable_mariadb|bool and enable_external_mariadb_load_balancer|bool }}"
mode: "tcp"
port: "{{ mariadb_port }}"
port: "{{ database_port }}"
listen_port: "{{ mariadb_port }}"
frontend_tcp_extra:
- "option clitcpka"
- "timeout client 3600s"

View File

@ -0,0 +1,7 @@
---
upgrade:
- MariaDB is now exposed via HAProxy on the ``database_port`` and
not the ``mariadb_port``. Out of the box these are both the same,
but if you have customised ``mariadb_port`` so that it is different
to the ``database_port`` and you have a service talking to it
via HAProxy on that port then you should review your configuration.