[WIP] Fixes for MCP1.0 galera

Change-Id: I91f55d599f5291f34bfa81f55dafd6734606e1cc
diff --git a/galera/map.jinja b/galera/map.jinja
index cf9c66d..ae1aabb 100644
--- a/galera/map.jinja
+++ b/galera/map.jinja
@@ -21,7 +21,7 @@
 
 {%- set slave = salt['grains.filter_by']({
   'Debian': {
-    'pkgs': ['mysql-server-wsrep', 'galera', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
+    'pkgs': ['mysql-server-wsrep-5.6', 'galera-3', 'rsync', 'python-mysqldb', 'libmysqlclient18', 'psmisc', 'netcat', 'percona-xtrabackup', 'socat', 'libdbd-mysql', 'python-pymysql'],
     'service': 'mysql',
     'wsrep_provider': '/usr/lib/galera/libgalera_smm.so',
     'log_file': '/var/log/mysql.log',
diff --git a/galera/master.sls b/galera/master.sls
index 32c16e2..7a1025d 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -102,6 +102,7 @@
   - source: salt://galera/files/my.cnf.pre
   - mode: 644
   - template: jinja
+  - makedirs: True
   - require_in:
     - pkg: galera_packages
 
diff --git a/galera/slave.sls b/galera/slave.sls
index 5ca72f8..8b801fa 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -102,6 +102,7 @@
   - source: salt://galera/files/my.cnf.pre
   - mode: 644
   - template: jinja
+  - makedirs: true
   - require_in:
     - pkg: galera_packages