Browse Source

Fix non-bootstrap run

Conflicts:
	galera/master.sls
	galera/slave.sls
tags/1.0
Filip Pytloun 9 years ago
parent
commit
52d29b5290
2 changed files with 3 additions and 5 deletions
  1. +1
    -0
      galera/master.sls
  2. +2
    -5
      galera/slave.sls

+ 1
- 0
galera/master.sls View File

- template: jinja - template: jinja
- require: - require:
- file: galera_bootstrap_temp_config - file: galera_bootstrap_temp_config
- file: galera_run_dir


galera_bootstrap_set_root_password: galera_bootstrap_set_root_password:
cmd.run: cmd.run:

+ 2
- 5
galera/slave.sls View File

- template: jinja - template: jinja
- require: - require:
- file: galera_bootstrap_temp_config - file: galera_bootstrap_temp_config
- file: galera_run_dir


galera_bootstrap_set_root_password: galera_bootstrap_set_root_password:
cmd.run: cmd.run:
galera_bootstrap_start_service_final: galera_bootstrap_start_service_final:
cmd.script: cmd.script:
- name: slave_bootstrap - name: slave_bootstrap
<<<<<<< HEAD
- source: salt://galera/files/slave_bootstrap.sh
- template: jinja
=======
- source: salt://galera/files/bootstrap.sh - source: salt://galera/files/bootstrap.sh
>>>>>>> 5f0d683... galera bootstrap improvements
- template: jinja
- require: - require:
- file: galera_bootstrap_init_config - file: galera_bootstrap_init_config



Loading…
Cancel
Save