diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-23 20:12:41 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-23 20:15:37 +0000 |
| commit | 268aaa60fd599caec32d4bc2bad6eb85437e6b37 (patch) | |
| tree | b6a9c9ce44f9895534f7a68d6d7f9c7559d2431b | |
| parent | 3842391b7836e1fa63131258c610920d617b624b (diff) | |
| download | kolla-268aaa60fd599caec32d4bc2bad6eb85437e6b37.tar.gz kolla-268aaa60fd599caec32d4bc2bad6eb85437e6b37.zip | |
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
| -rw-r--r-- | ansible/roles/mariadb/templates/mariadb.json.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/mariadb/templates/mariadb.json.j2 b/ansible/roles/mariadb/templates/mariadb.json.j2 index 359acf8d8..7317d996e 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" } |