Skip to content
Snippets Groups Projects
Commit adb2bdec authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Fix haproxy deploy for external mariadb cluster"

parents 6160cdc5 0a7d189d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/mariadb/defaults/main.yml
+ 1
− 1
View file @ adb2bdec
...@@ -24,7 +24,7 @@ mariadb_services: ...@@ -24,7 +24,7 @@ mariadb_services:
- "option mysql-check user haproxy post-41" - "option mysql-check user haproxy post-41"
custom_member_list: "{{ internal_haproxy_members.split(';') }}" custom_member_list: "{{ internal_haproxy_members.split(';') }}"
mariadb_external_lb: mariadb_external_lb:
enabled: "{{ enable_mariadb|bool and enable_external_mariadb_load_balancer|bool }}" enabled: "{{ enable_external_mariadb_load_balancer|bool }}"
mode: "tcp" mode: "tcp"
port: "{{ database_port }}" port: "{{ database_port }}"
listen_port: "{{ mariadb_port }}" listen_port: "{{ mariadb_port }}"
......
ansible/site.yml
+ 1
− 1
View file @ adb2bdec
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
role: mariadb role: mariadb
tasks_from: loadbalancer tasks_from: loadbalancer
tags: mariadb tags: mariadb
when: enable_mariadb | bool when: enable_mariadb | bool or enable_external_mariadb_load_balancer | bool
- include_role: - include_role:
role: masakari role: masakari
tasks_from: loadbalancer tasks_from: loadbalancer
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment