commit 52d29b52900163cc3d7dbe8bab527963771f7eea
author Filip Pytloun <filip@pytloun.cz> Tue Jul 21 18:10:32 2015 +0200
committer Filip Pytloun <filip@pytloun.cz> Tue Feb 23 10:51:40 2016 +0100
tree 25d0055b1b1dec339908c88b7bf30b37c8d1d09c
parent 4e4575f775fa5356eefa4ad5ac5ad863aab47af0

Fix non-bootstrap run

Conflicts:
	galera/master.sls
	galera/slave.sls

galera/master.sls

diff --git a/galera/master.sls b/galera/master.sls
index cb844e0..cd99dd6 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -75,6 +75,7 @@
   - template: jinja
   - require: 
     - file: galera_bootstrap_temp_config
+    - file: galera_run_dir
 
 galera_bootstrap_set_root_password:
   cmd.run:

galera/slave.sls

diff --git a/galera/slave.sls b/galera/slave.sls
index dfd30b9..4b5e6f2 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -75,6 +75,7 @@
   - template: jinja
   - require: 
     - file: galera_bootstrap_temp_config
+    - file: galera_run_dir
 
 galera_bootstrap_set_root_password:
   cmd.run:
@@ -106,12 +107,8 @@
 galera_bootstrap_start_service_final:
   cmd.script:
   - name: slave_bootstrap
-<<<<<<< HEAD
-  - source: salt://galera/files/slave_bootstrap.sh
-  - template: jinja
-=======
   - source: salt://galera/files/bootstrap.sh
->>>>>>> 5f0d683... galera bootstrap improvements
+  - template: jinja
   - require: 
     - file: galera_bootstrap_init_config