From 268aaa60fd599caec32d4bc2bad6eb85437e6b37 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 23 Oct 2015 20:12:41 +0000 Subject: [PATCH] Fix broken galera A previous commit [1] broke Galera on Ubuntu while trying to fix Centos. This fixes the underlying different between the two distros and should help prevent that kind of mistake in the future. [1] I523d1989575dbe24a891fcae3b6bf56d83e69615 Change-Id: Ie3e47f10cb669f36f8d2f166c88555931a54e3ec Backport: Liberty Closes-Bug: #1509281 --- ansible/roles/mariadb/templates/mariadb.json.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/mariadb/templates/mariadb.json.j2 b/ansible/roles/mariadb/templates/mariadb.json.j2 index 359acf8d8a..7317d996e6 100644 --- a/ansible/roles/mariadb/templates/mariadb.json.j2 +++ b/ansible/roles/mariadb/templates/mariadb.json.j2 @@ -1,10 +1,10 @@ -{% set mysql_dir = 'mysql/conf.d' if kolla_base_distro in ['ubuntu', 'debian'] else 'my.cnf.d' %} +{% set mysql_dir = 'mysql' if kolla_base_distro in ['ubuntu', 'debian'] else '' %} { "command": "/usr/bin/mysqld_safe", "config_files": [ { "source": "{{ container_config_directory }}/galera.cnf", - "dest": "/etc/{{ mysql_dir }}/galera.cnf", + "dest": "/etc/{{ mysql_dir }}/my.cnf", "owner": "mysql", "perm": "0600" }