Merge "Config files having underscores breaks Kolla-Kubernetes."

This commit is contained in:
Jenkins 2016-06-09 14:07:32 +00:00 committed by Gerrit Code Review
commit 6e8f01ca6a
4 changed files with 6 additions and 6 deletions

View File

@ -26,9 +26,9 @@
with_items: with_items:
- "mariadb" - "mariadb"
- name: Copying over wsrep_notify.sh - name: Copying over wsrep-notify.sh
template: template:
src: "{{ role_path }}/templates/wsrep_notify.sh.j2" src: "{{ role_path }}/templates/wsrep-notify.sh.j2"
dest: "{{ node_config_directory }}/{{ item }}/wsrep_notify.sh" dest: "{{ node_config_directory }}/{{ item }}/wsrep-notify.sh"
with_items: with_items:
- "mariadb" - "mariadb"

View File

@ -24,7 +24,7 @@ wsrep_node_name={{ ansible_hostname }}
wsrep_sst_method=xtrabackup-v2 wsrep_sst_method=xtrabackup-v2
wsrep_sst_auth={{ database_user }}:{{ database_password }} wsrep_sst_auth={{ database_user }}:{{ database_password }}
wsrep_slave_threads=4 wsrep_slave_threads=4
wsrep_notify_cmd=/usr/local/bin/wsrep_notify.sh wsrep_notify_cmd=/usr/local/bin/wsrep-notify.sh
max_connections=10000 max_connections=10000

View File

@ -9,8 +9,8 @@
"perm": "0600" "perm": "0600"
}, },
{ {
"source": "{{ container_config_directory }}/wsrep_notify.sh", "source": "{{ container_config_directory }}/wsrep-notify.sh",
"dest": "/usr/local/bin/wsrep_notify.sh", "dest": "/usr/local/bin/wsrep-notify.sh",
"owner": "mysql", "owner": "mysql",
"perm": "0700" "perm": "0700"
} }