saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #477 from noelmcloughlin/fx

Browse Source 
fix(minion): fix requisites from recent prs
This commit is contained in:
Imran Iqbal 2020-07-15 16:25:21 +01:00 committed by GitHub
commit 5cee96484d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/master.sls
View File

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

4
salt/minion.sls
View File

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