Fix cmd.script and template support in old salt
diff --git a/galera/master.sls b/galera/master.sls
index cd99dd6..b383462 100644
--- a/galera/master.sls
+++ b/galera/master.sls
@@ -56,6 +56,13 @@
- require:
- pkg: galera_packages
+galera_bootstrap_script:
+ file.managed:
+ - name: /usr/local/sbin/galera_bootstrap.sh
+ - mode: 755
+ - source: salt://galera/files/bootstrap.sh
+ - template: jinja
+
{%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0' %}
galera_bootstrap_temp_config:
@@ -69,13 +76,12 @@
- file: galera_init_script
galera_bootstrap_start_service:
- cmd.script:
- - name: master_initial_bootstrap
- - source: salt://galera/files/bootstrap.sh
- - template: jinja
- - require:
+ cmd.run:
+ - name: /usr/local/sbin/galera_bootstrap.sh
+ - require:
- file: galera_bootstrap_temp_config
- file: galera_run_dir
+ - file: galera_bootstrap_script
galera_bootstrap_set_root_password:
cmd.run:
@@ -105,11 +111,11 @@
- service: galera_bootstrap_stop_service
galera_bootstrap_start_service_final:
- cmd.script:
- - name: master_bootstrap
- - source: salt://galera/files/bootstrap.sh
- - require:
+ cmd.run:
+ - name: /usr/local/sbin/galera_bootstrap.sh
+ - require:
- file: galera_bootstrap_init_config
+ - file: galera_bootstrap_script
galera_bootstrap_finish_flag:
file.touch:
diff --git a/galera/slave.sls b/galera/slave.sls
index 4b5e6f2..2d5a6d0 100644
--- a/galera/slave.sls
+++ b/galera/slave.sls
@@ -56,6 +56,13 @@
- require:
- pkg: galera_packages
+galera_bootstrap_script:
+ file.managed:
+ - name: /usr/local/sbin/galera_bootstrap.sh
+ - mode: 755
+ - source: salt://galera/files/bootstrap.sh
+ - template: jinja
+
{%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0' %}
galera_bootstrap_temp_config:
@@ -69,13 +76,12 @@
- file: galera_init_script
galera_bootstrap_start_service:
- cmd.script:
- - name: slave_initial_bootstrap
- - source: salt://galera/files/bootstrap.sh
- - template: jinja
+ cmd.run:
+ - name: /usr/local/sbin/galera_bootstrap.sh
- require:
- file: galera_bootstrap_temp_config
- file: galera_run_dir
+ - file: galera_bootstrap_script
galera_bootstrap_set_root_password:
cmd.run:
@@ -105,12 +111,11 @@
- service: galera_bootstrap_stop_service
galera_bootstrap_start_service_final:
- cmd.script:
- - name: slave_bootstrap
- - source: salt://galera/files/bootstrap.sh
- - template: jinja
+ cmd.run:
+ - name: /usr/local/sbin/galera_bootstrap.sh
- require:
- file: galera_bootstrap_init_config
+ - file: galera_bootstrap_script
galera_bootstrap_finish_flag:
file.touch: