openstack
/
kolla
Code Issues Proposed changes

Merge "Fix broken galera"

This commit is contained in:
Jenkins 2015-10-24 00:30:55 +00:00 committed by Gerrit Code Review
parent d47af2710e 268aaa60fd
commit 9bb4058489
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",
"config_files": [
{
"source": "{{ container_config_directory }}/galera.cnf",
"dest": "/etc/{{ mysql_dir }}/galera.cnf",
"dest": "/etc/{{ mysql_dir }}/my.cnf",
"owner": "mysql",
"perm": "0600"
}