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

fix(windows): dont run master state

Browse Source
This commit is contained in:
noelmcloughlin 2020-09-11 20:53:00 +01:00
parent 2dcd0c80ef
commit a36f2eb2d2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/init.sls
View File

@ -6,7 +6,7 @@ include:
{%- if salt.config.get('salt_formulas:list') %} {%- if salt.config.get('salt_formulas:list') %}
- salt.formulas - salt.formulas
{%- endif %} {%- endif %}
{%- if salt.config.get('salt:master')|length > 1 %} {%- if salt.config.get('salt:master')|length > 1 and grains.kernel != 'Windows' %}
- salt.master - salt.master
{%- endif %} {%- endif %}
{%- if salt.config.get('salt:cloud')|length > 1 %} {%- if salt.config.get('salt:cloud')|length > 1 %}

11
salt/master.sls
View File

@ -7,6 +7,8 @@ include:
- .pin - .pin
{% endif %} {% endif %}
{%- if grains.kernel != 'Windows' %}
{%- if grains.os == 'MacOS' %} {%- if grains.os == 'MacOS' %}
salt-master-macos: salt-master-macos:
file.managed: file.managed:
@ -75,3 +77,12 @@ remove-default-master-conf-file:
remove-old-master-conf-file: remove-old-master-conf-file:
file.absent: file.absent:
- name: {{ salt_settings.config_path }}/master.d/_defaults.conf - name: {{ salt_settings.config_path }}/master.d/_defaults.conf
{%- else %}
salt-master-install-skip:
test.show_notification:
- text: |
No salt-master state for Windows
{%- endif %}