diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-24 00:30:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-24 00:30:55 +0000 |
| commit | 9bb405848932fcd97191a857cff2231239e904fe (patch) | |
| tree | d271d726c67204adb53d387f60d885ee56aa12e6 | |
| parent | d47af2710e0448f27fc10c75d0f5d8accf350fde (diff) | |
| parent | 268aaa60fd599caec32d4bc2bad6eb85437e6b37 (diff) | |
| download | kolla-9bb405848932fcd97191a857cff2231239e904fe.tar.gz kolla-9bb405848932fcd97191a857cff2231239e904fe.zip | |
Merge "Fix broken galera"
| -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" } |