Merge pull request #319 from genuss/restart_via_at
Add restart minion via at (fixes #136)
This commit is contained in:
commit
9cf5cd2c00
@ -4,6 +4,7 @@ salt:
|
|||||||
install_packages: True
|
install_packages: True
|
||||||
use_pip: False
|
use_pip: False
|
||||||
clean_config_d_dir: True
|
clean_config_d_dir: True
|
||||||
|
restart_via_at: False
|
||||||
|
|
||||||
config_path: /etc/salt
|
config_path: /etc/salt
|
||||||
|
|
||||||
|
@ -16,12 +16,30 @@ salt-minion:
|
|||||||
service.running:
|
service.running:
|
||||||
- enable: True
|
- enable: True
|
||||||
- name: {{ salt_settings.minion_service }}
|
- name: {{ salt_settings.minion_service }}
|
||||||
|
{%- if not salt_settings.restart_via_at %}
|
||||||
- watch:
|
- watch:
|
||||||
{% if salt_settings.install_packages %}
|
{%- if salt_settings.install_packages %}
|
||||||
- pkg: salt-minion
|
- pkg: salt-minion
|
||||||
{% endif %}
|
{%- endif %}
|
||||||
- file: salt-minion
|
- file: salt-minion
|
||||||
- file: remove-old-minion-conf-file
|
- file: remove-old-minion-conf-file
|
||||||
|
{%- else %}
|
||||||
|
at:
|
||||||
|
pkg.installed: []
|
||||||
|
|
||||||
|
restart-salt-minion:
|
||||||
|
cmd.wait:
|
||||||
|
- name: echo salt-call --local service.restart salt-minion | at now + 1 minute
|
||||||
|
- order: last
|
||||||
|
- require:
|
||||||
|
- pkg: at
|
||||||
|
- watch:
|
||||||
|
{%- if salt_settings.install_packages %}
|
||||||
|
- pkg: salt-minion
|
||||||
|
{%- endif %}
|
||||||
|
- file: salt-minion
|
||||||
|
- file: remove-old-minion-conf-file
|
||||||
|
{%- endif %}
|
||||||
|
|
||||||
{% if salt_settings.minion_remove_config %}
|
{% if salt_settings.minion_remove_config %}
|
||||||
remove-default-minion-conf-file:
|
remove-default-minion-conf-file:
|
||||||
|
Loading…
Reference in New Issue
Block a user