From 0a7d189d05f6a34dbda713dbed723a03237e5ce4 Mon Sep 17 00:00:00 2001
From: lklimin <lklimin@gmail.com>
Date: Sun, 3 Nov 2019 23:07:57 +0300
Subject: [PATCH] Fix haproxy deploy for external mariadb cluster
Change-Id: I12fa6ae8dcec79485c30c4fea2977875aa8f4fae
Closes-Bug: #1850792
---
ansible/roles/mariadb/defaults/main.yml | 2 +-
ansible/site.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 054eb9bd59..a4a7c49f70 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -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 }}"
diff --git a/ansible/site.yml b/ansible/site.yml
index 64892da14f..776bc224e5 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -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