From 88fbf17664ca8c7fd2e32b8db9a0f7417b250e36 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <michal.nasiadka@nokia.com>
Date: Thu, 14 Feb 2019 13:18:10 +0100
Subject: [PATCH] Fix MariaDB bootstrap issues on CentOS

Those issues intermittently show up in various branches,
in all cases it's wrong path used to resolveip binary.
Similar to the recent kolla-ansible-ubuntu-source job failures.

Change-Id: I8cce42b60897e4ceb8d3b0bd5181fda88b10c2b8
(cherry picked from commit 38c0a4f2d210dea95b97675fb29d12f656a19bf8)
---
 ansible/roles/mariadb/templates/galera.cnf.j2 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2
index 9437e6d488..eb85296a96 100644
--- a/ansible/roles/mariadb/templates/galera.cnf.j2
+++ b/ansible/roles/mariadb/templates/galera.cnf.j2
@@ -8,9 +8,7 @@ default-character-set=utf8
 default-character-set=utf8
 
 [mysqld]
-{% if kolla_base_distro in ['debian', 'ubuntu'] %}
 basedir=/usr
-{% endif %}
 bind-address={{ api_interface_address }}
 port={{ mariadb_port }}