diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-09 14:07:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-09 14:07:32 +0000 |
| commit | 6e8f01ca6a02f77a281df78f544cace063c78511 (patch) | |
| tree | 76cff5e72af9b35f1a5d7d195d67752c100d94b6 | |
| parent | 2a38e477e0edbc408dd8688044d5d75f29b3c420 (diff) | |
| parent | 1d74db7df0f314703b73cde4acaed336d2b66e80 (diff) | |
| download | kolla-6e8f01ca6a02f77a281df78f544cace063c78511.tar.gz kolla-6e8f01ca6a02f77a281df78f544cace063c78511.zip | |
Merge "Config files having underscores breaks Kolla-Kubernetes."
| -rw-r--r-- | ansible/roles/mariadb/tasks/config.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/mariadb/templates/galera.cnf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/mariadb/templates/mariadb.json.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/mariadb/templates/wsrep-notify.sh.j2 (renamed from ansible/roles/mariadb/templates/wsrep_notify.sh.j2) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index 01a911905..a748c1adf 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -26,9 +26,9 @@ with_items: - "mariadb" -- name: Copying over wsrep_notify.sh +- name: Copying over wsrep-notify.sh template: - src: "{{ role_path }}/templates/wsrep_notify.sh.j2" - dest: "{{ node_config_directory }}/{{ item }}/wsrep_notify.sh" + src: "{{ role_path }}/templates/wsrep-notify.sh.j2" + dest: "{{ node_config_directory }}/{{ item }}/wsrep-notify.sh" with_items: - "mariadb" diff --git a/ansible/roles/mariadb/templates/galera.cnf.j2 b/ansible/roles/mariadb/templates/galera.cnf.j2 index 23919e2f3..7ffcb26a0 100644 --- a/ansible/roles/mariadb/templates/galera.cnf.j2 +++ b/ansible/roles/mariadb/templates/galera.cnf.j2 @@ -24,7 +24,7 @@ wsrep_node_name={{ ansible_hostname }} wsrep_sst_method=xtrabackup-v2 wsrep_sst_auth={{ database_user }}:{{ database_password }} 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 diff --git a/ansible/roles/mariadb/templates/mariadb.json.j2 b/ansible/roles/mariadb/templates/mariadb.json.j2 index d9c1c0b38..cfee62e4d 100644 --- a/ansible/roles/mariadb/templates/mariadb.json.j2 +++ b/ansible/roles/mariadb/templates/mariadb.json.j2 @@ -9,8 +9,8 @@ "perm": "0600" }, { - "source": "{{ container_config_directory }}/wsrep_notify.sh", - "dest": "/usr/local/bin/wsrep_notify.sh", + "source": "{{ container_config_directory }}/wsrep-notify.sh", + "dest": "/usr/local/bin/wsrep-notify.sh", "owner": "mysql", "perm": "0700" } diff --git a/ansible/roles/mariadb/templates/wsrep_notify.sh.j2 b/ansible/roles/mariadb/templates/wsrep-notify.sh.j2 index babd29e86..babd29e86 100644 --- a/ansible/roles/mariadb/templates/wsrep_notify.sh.j2 +++ b/ansible/roles/mariadb/templates/wsrep-notify.sh.j2 |