From 1d74db7df0f314703b73cde4acaed336d2b66e80 Mon Sep 17 00:00:00 2001
From: Ken Wronkiewicz <wh-openstack@wirewd.com>
Date: Mon, 6 Jun 2016 16:58:58 -0700
Subject: [PATCH] Config files having underscores breaks Kolla-Kubernetes.

I just thought I'd dash off a quick patch and change the underscore
to a dash.

Change-Id: Ib34cfc8039de01be7e37176648482f9815ac3848
Closes-Bug: #1589734
---
 ansible/roles/mariadb/tasks/config.yml                      | 6 +++---
 ansible/roles/mariadb/templates/galera.cnf.j2               | 2 +-
 ansible/roles/mariadb/templates/mariadb.json.j2             | 4 ++--
 .../templates/{wsrep_notify.sh.j2 => wsrep-notify.sh.j2}    | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename ansible/roles/mariadb/templates/{wsrep_notify.sh.j2 => wsrep-notify.sh.j2} (100%)

diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml
index 01a911905b..a748c1adf0 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 23919e2f3c..7ffcb26a05 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 d9c1c0b385..cfee62e4d9 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
similarity index 100%
rename from ansible/roles/mariadb/templates/wsrep_notify.sh.j2
rename to ansible/roles/mariadb/templates/wsrep-notify.sh.j2