Bläddra i källkod

refactor(minion): use `pkg.installed` state for macOS

Keep consistent with `salt/master.sls`.
tags/v1.11.0
Imran Iqbal 2 år sedan
förälder
incheckning
3eff2d2acf
Inget konto är kopplat till bidragsgivarens mejladress
1 ändrade filer med 9 tillägg och 6 borttagningar
  1. +9
    -6
      salt/minion.sls

+ 9
- 6
salt/minion.sls Visa fil

@@ -29,10 +29,13 @@ download-salt-minion:
- macpackage: salt-minion
- retry: {{ salt_settings.retry_options | json }}
{%- elif "workaround https://github.com/saltstack/salt/issues/49348" %}
cmd.run:
- name: /usr/local/bin/brew install {{ salt_settings.salt_minion }}
- onlyif: test -x /usr/local/bin/brew
- runas: {{ salt_settings.rootuser }}
{% if salt_settings.install_packages %}
pkg.installed:
- name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{% endif %}
{%- endif %}

salt-minion-macos:
@@ -130,7 +133,7 @@ salt-minion:
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
- macpackage: salt-minion
{%- elif grains.os == 'MacOS' %}
- cmd: download-salt-minion
- pkg: download-salt-minion
{%- else %}
- pkg: salt-minion
{%- endif %}
@@ -155,7 +158,7 @@ restart-salt-minion:
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
- macpackage: salt-minion
{%- elif grains.os == 'MacOS' %}
- cmd: download-salt-minion
- pkg: download-salt-minion
{%- else %}
- pkg: salt-minion
{%- endif %}

Laddar…
Avbryt
Spara