Skip to content

Commit

Permalink
fix(windows): dont run master state
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmcloughlin committed Sep 11, 2020
1 parent 2dcd0c8 commit a36f2eb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion salt/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include:
{%- if salt.config.get('salt_formulas:list') %}
- salt.formulas
{%- endif %}
{%- if salt.config.get('salt:master')|length > 1 %}
{%- if salt.config.get('salt:master')|length > 1 and grains.kernel != 'Windows' %}
- salt.master
{%- endif %}
{%- if salt.config.get('salt:cloud')|length > 1 %}
Expand Down
11 changes: 11 additions & 0 deletions salt/master.sls
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ include:
- .pin
{% endif %}
{%- if grains.kernel != 'Windows' %}
{%- if grains.os == 'MacOS' %}
salt-master-macos:
file.managed:
Expand Down Expand Up @@ -75,3 +77,12 @@ remove-default-master-conf-file:
remove-old-master-conf-file:
file.absent:
- 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 %}

0 comments on commit a36f2eb

Please sign in to comment.