Merge "Fix haproxy deploy for external mariadb cluster"

This commit is contained in:
Zuul 2019-11-04 17:50:10 +00:00 committed by Gerrit Code Review
commit adb2bdec56
2 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ mariadb_services:
- "option mysql-check user haproxy post-41"
custom_member_list: "{{ internal_haproxy_members.split(';') }}"
mariadb_external_lb:
enabled: "{{ enable_mariadb|bool and enable_external_mariadb_load_balancer|bool }}"
enabled: "{{ enable_external_mariadb_load_balancer|bool }}"
mode: "tcp"
port: "{{ database_port }}"
listen_port: "{{ mariadb_port }}"

View File

@ -240,7 +240,7 @@
role: mariadb
tasks_from: loadbalancer
tags: mariadb
when: enable_mariadb | bool
when: enable_mariadb | bool or enable_external_mariadb_load_balancer | bool
- include_role:
role: masakari
tasks_from: loadbalancer