Bladeren bron

Fix cmd.script and template support in old salt

tags/1.0
Filip Pytloun 8 jaren geleden
bovenliggende
commit
9ba63ff9d2
2 gewijzigde bestanden met toevoegingen van 28 en 17 verwijderingen
  1. +15
    -9
      galera/master.sls
  2. +13
    -8
      galera/slave.sls

+ 15
- 9
galera/master.sls Bestand weergeven

- require: - require:
- pkg: galera_packages - 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' %} {%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0' %}


galera_bootstrap_temp_config: galera_bootstrap_temp_config:
- file: galera_init_script - file: galera_init_script


galera_bootstrap_start_service: 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_bootstrap_temp_config
- file: galera_run_dir - file: galera_run_dir
- file: galera_bootstrap_script


galera_bootstrap_set_root_password: galera_bootstrap_set_root_password:
cmd.run: cmd.run:
- service: galera_bootstrap_stop_service - service: galera_bootstrap_stop_service


galera_bootstrap_start_service_final: 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_init_config
- file: galera_bootstrap_script


galera_bootstrap_finish_flag: galera_bootstrap_finish_flag:
file.touch: file.touch:

+ 13
- 8
galera/slave.sls Bestand weergeven

- require: - require:
- pkg: galera_packages - 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' %} {%- if salt['cmd.run']('test -e /var/lib/mysql/.galera_bootstrap; echo $?') != '0' %}


galera_bootstrap_temp_config: galera_bootstrap_temp_config:
- file: galera_init_script - file: galera_init_script


galera_bootstrap_start_service: 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: - require:
- file: galera_bootstrap_temp_config - file: galera_bootstrap_temp_config
- file: galera_run_dir - file: galera_run_dir
- file: galera_bootstrap_script


galera_bootstrap_set_root_password: galera_bootstrap_set_root_password:
cmd.run: cmd.run:
- service: galera_bootstrap_stop_service - service: galera_bootstrap_stop_service


galera_bootstrap_start_service_final: 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: - require:
- file: galera_bootstrap_init_config - file: galera_bootstrap_init_config
- file: galera_bootstrap_script


galera_bootstrap_finish_flag: galera_bootstrap_finish_flag:
file.touch: file.touch:

Laden…
Annuleren
Opslaan