openstack/kolla-ansible
Code Issues Proposed changes

Fix broken galera

Browse Source 
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
This commit is contained in:
Sam Yaple 2015-10-23 20:12:41 +00:00
parent 3842391b78
commit 268aaa60fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/mariadb/templates/mariadb.json.j2
View File

@ -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", "command": "/usr/bin/mysqld_safe",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/galera.cnf", "source": "{{ container_config_directory }}/galera.cnf",
"dest": "/etc/{{ mysql_dir }}/galera.cnf", "dest": "/etc/{{ mysql_dir }}/my.cnf",
"owner": "mysql", "owner": "mysql",
"perm": "0600" "perm": "0600"
} }