Browse Source

narrow syntax for 'noservices', False

pr/24
Petr Michalec 7 years ago
parent
commit
4f87309bce
No account linked to committer's email address
3 changed files with 13 additions and 13 deletions
  1. +7
    -7
      galera/master.sls
  2. +1
    -1
      galera/server.sls
  3. +5
    -5
      galera/slave.sls

+ 7
- 7
galera/master.sls View File

@@ -106,7 +106,7 @@ galera_pre_config:
- require_in:
- pkg: galera_packages

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_init_start_service:
cmd.run:
@@ -130,7 +130,7 @@ mysql_bootstrap_update_maint_password:
galera_bootstrap_stop_service:
service.dead:
- name: {{ master.service }}
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require:
- cmd: mysql_bootstrap_update_maint_password
{%- endif %}
@@ -143,12 +143,12 @@ galera_bootstrap_init_config:
- source: salt://galera/files/my.cnf.init
- mode: 644
- template: jinja
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require:
- service: galera_bootstrap_stop_service
{%- endif %}

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_bootstrap_start_service_final:
cmd.run:
@@ -162,7 +162,7 @@ galera_bootstrap_start_service_final:
galera_bootstrap_finish_flag:
file.touch:
- name: /var/lib/mysql/.galera_bootstrap
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require:
- cmd: galera_bootstrap_start_service_final
{%- endif %}
@@ -177,12 +177,12 @@ galera_config:
- source: salt://galera/files/my.cnf
- mode: 644
- template: jinja
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require_in:
- service: galera_service
{%- endif %}

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_service:
service.running:

+ 1
- 1
galera/server.sls View File

@@ -53,7 +53,7 @@ restore_mysql_database_{{ database_name }}:

{%- endfor %}

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
{%- for user in server.get('users', []) %}

mysql_user_{{ user.name }}_{{ user.host }}:

+ 5
- 5
galera/slave.sls View File

@@ -106,7 +106,7 @@ galera_pre_config:
- require_in:
- pkg: galera_packages

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_init_start_service:
cmd.run:
@@ -141,12 +141,12 @@ galera_bootstrap_init_config:
- source: salt://galera/files/my.cnf
- mode: 644
- template: jinja
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require:
- service: galera_bootstrap_stop_service
{%- endif %}

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_bootstrap_start_service_final:
cmd.run:
@@ -172,12 +172,12 @@ galera_config:
- source: salt://galera/files/my.cnf
- mode: 644
- template: jinja
{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}
- require_in:
- service: galera_service
{%- endif %}

{%- if not grains.get('noservices','false')%}
{%- if not grains.get('noservices', False) %}

galera_service:
service.running:

Loading…
Cancel
Save