commit 4e4575f775fa5356eefa4ad5ac5ad863aab47af0
author Jakub Pavlik <j.pavlik@tcpcloud.eu> Tue Sep 01 22:05:52 2015 +0200
committer Filip Pytloun <filip@pytloun.cz> Tue Feb 23 10:50:18 2016 +0100
tree 1ea5f6e4f5c2e560f6df66a8b26566ac7458ce29
parent b47411da1f3f80a8c3149b98be72ff82723f65c4

galera bootstrap improvements

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

galera/slave.sls

diff --git a/galera/slave.sls b/galera/slave.sls
index 0eb9632..dfd30b9 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -56,7 +56,7 @@
   - require: 
     - pkg: galera_packages
 
-{%- if salt['cmd.run']('test -e /root/.galera_bootstrap; echo $?') != '0'  %}
+{%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0'  %}
 
 galera_bootstrap_temp_config:
   file.managed:
@@ -69,8 +69,10 @@
     - file: galera_init_script
 
 galera_bootstrap_start_service:
-  service.running:
-  - name: {{ slave.service }}
+  cmd.script:
+  - name: slave_initial_bootstrap
+  - source: salt://galera/files/bootstrap.sh
+  - template: jinja
   - require: 
     - file: galera_bootstrap_temp_config
 
@@ -78,7 +80,7 @@
   cmd.run:
   - name: mysqladmin password "{{ slave.admin.password }}"
   - require:
-    - service: galera_bootstrap_start_service
+    - cmd: galera_bootstrap_start_service
 
 mysql_bootstrap_update_maint_password:
   cmd.run:
@@ -104,14 +106,18 @@
 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
   - require: 
     - file: galera_bootstrap_init_config
 
 galera_bootstrap_finish_flag:
   file.touch:
-  - name: /root/.galera_bootstrap
+  - name: /var/lib/mysql/.galera_bootstrap
   - require:
     - cmd: galera_bootstrap_start_service_final
   - watch_in: