From 467164efae600a1e84b7ba206c4ef45138d37422 Mon Sep 17 00:00:00 2001 From: jeanluc Date: Wed, 23 Mar 2022 13:36:09 +0100 Subject: [PATCH] fix(minion): do not reinstall every run on MacOS --- salt/minion.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/minion.sls b/salt/minion.sls index 90f97dd6c..88f28e131 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -24,7 +24,7 @@ download-salt-minion: - group: wheel - mode: '0644' - unless: - - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' + - test -n "{{ salt_settings.version }}" && /opt/salt/bin/salt-minion --version | grep -E '{{ salt_settings.version }}$' - require_in: - macpackage: salt-minion - retry: {{ salt_settings.retry_options | json }} @@ -58,7 +58,7 @@ salt-minion: {# macpackage.installed is weird with version_check, detects diff but incomplete install #} - force: True {# workaround #} - unless: - - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*' + - test -n "{{ salt_settings.version }}" && /opt/salt/bin/salt-minion --version | grep -E '{{ salt_settings.version }}$' {% if salt_settings.minion_service_details.state != 'ignore' %} - require_in: - service: salt-minion