fix(freebsd): update to provide support for most recent versions

This commit is contained in:
Imran Iqbal committed 2021-03-30 12:40:41 +01:00
1 parent bbd7286240
commit 24ebbb4e0c
6 files changed
+251

No files matched your search

+3
View File
@@ -27,6 +27,9 @@ salt-master:
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
{%- endif %}
{%- if grains.os_family == 'FreeBSD' %}
- unless: pkg info | grep {{ salt_settings.salt_master }}
{%- endif %}
{% if salt_settings.master_service_details.state != 'ignore' %}
- require_in:
- service: salt-master
+6
View File
@@ -71,6 +71,9 @@ salt-minion:
{%- if salt_settings.version %}
- version: {{ salt_settings.version }}
{%- endif %}
{%- if grains.os_family == 'FreeBSD' %}
- unless: pkg info | grep {{ salt_settings.salt_master }}
{%- endif %}
{% if salt_settings.minion_service_details.state != 'ignore' %}
- require_in:
- service: salt-minion
@@ -97,6 +100,9 @@ salt-minion:
service.{{ salt_settings.minion_service_details.state }}:
- enable: {{ salt_settings.minion_service_details.enabled }}
- name: {{ salt_settings.minion_service }}
{%- if grains.os_family == 'FreeBSD' %}
- retry: {{ salt_settings.retry_options | json }}
{%- endif %}
- watch:
- file: remove-old-minion-conf-file
- order: last
+11
View File
@@ -63,5 +63,16 @@ MacOS:
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
FreeBSD:
salt_master: py37-salt-3002.6
salt_minion: py37-salt-3002.6
salt_syndic: py37-salt-3002.6
salt_cloud: py37-salt-3002.6
salt_api: py37-salt-3002.6
salt_ssh: py37-salt-3002.6
python_git: py37-GitPython-3.1.11
pygit2: py37-pygit2-1.3.0
python_dulwich: py37-dulwich-0.19.16
Windows:
parallel: false # not supported on windows/cygwin