Browse Source

fix(windows): dont run master state

tags/v1.5.2
noelmcloughlin 4 years ago
parent
commit
a36f2eb2d2
2 changed files with 12 additions and 1 deletions
  1. +1
    -1
      salt/init.sls
  2. +11
    -0
      salt/master.sls

+ 1
- 1
salt/init.sls View File

{%- 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
- 0
salt/master.sls View File

- .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:
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 %}

Loading…
Cancel
Save