Skip to content

Commit 3eff2d2

Browse files
committed
refactor(minion): use pkg.installed state for macOS
Keep consistent with `salt/master.sls`.
1 parent 8ab60b9 commit 3eff2d2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

salt/minion.sls

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ download-salt-minion:
2929
- macpackage: salt-minion
3030
- retry: {{ salt_settings.retry_options | json }}
3131
{%- elif "workaround https://github.com/saltstack/salt/issues/49348" %}
32-
cmd.run:
33-
- name: /usr/local/bin/brew install {{ salt_settings.salt_minion }}
34-
- onlyif: test -x /usr/local/bin/brew
35-
- runas: {{ salt_settings.rootuser }}
32+
{% if salt_settings.install_packages %}
33+
pkg.installed:
34+
- name: {{ salt_settings.salt_minion }}
35+
{%- if salt_settings.version is defined %}
36+
- version: {{ salt_settings.version }}
37+
{%- endif %}
38+
{% endif %}
3639
{%- endif %}
3740
3841
salt-minion-macos:
@@ -130,7 +133,7 @@ salt-minion:
130133
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
131134
- macpackage: salt-minion
132135
{%- elif grains.os == 'MacOS' %}
133-
- cmd: download-salt-minion
136+
- pkg: download-salt-minion
134137
{%- else %}
135138
- pkg: salt-minion
136139
{%- endif %}
@@ -155,7 +158,7 @@ restart-salt-minion:
155158
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
156159
- macpackage: salt-minion
157160
{%- elif grains.os == 'MacOS' %}
158-
- cmd: download-salt-minion
161+
- pkg: download-salt-minion
159162
{%- else %}
160163
- pkg: salt-minion
161164
{%- endif %}

0 commit comments

Comments
 (0)