Browse Source

Merge pull request #477 from noelmcloughlin/fx

fix(minion): fix requisites from recent prs
master
Imran Iqbal 2 years ago committed by GitHub
parent
commit
5cee96484d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      salt/master.sls
  2. 4
      salt/minion.sls

3
salt/master.sls

@ -55,8 +55,11 @@ salt-master:
- enable: {{ salt_settings.master_service_details.enabled }}
- name: {{ salt_settings.master_service }}
- watch:
{%- if grains.kernel|lower == 'darwin' %}
- file: salt-master-macos
{%- else %}
- file: salt-master
{%- endif %}
- file: remove-old-master-conf-file
{% endif %}
{% if salt_settings.master_remove_config %}

4
salt/minion.sls

@ -51,6 +51,8 @@ salt-minion-macos:
interval: 10
splay: 10
- require_in:
- service: salt-minion
- watch_in:
- service: salt-minion
{%- endif %}
{%- endif %}
@ -104,8 +106,6 @@ salt-minion:
- enable: {{ salt_settings.minion_service_details.enabled }}
- name: {{ salt_settings.minion_service }}
- watch:
- file: salt-master-macos
- file: salt-master
- file: remove-old-minion-conf-file
{% endif %}
{%- if not salt_settings.restart_via_at %}

Loading…
Cancel
Save