saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

fix(freebsd): fix package names [skip ci]

Browse Source 
Resolves issues introduced in 24ebbb4e0c.
This commit is contained in:
Imran Iqbal 2021-04-04 09:41:02 +01:00
parent 26f2cc1ef0
commit a30f124485
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
6 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/master.sls
View File

@ -27,9 +27,6 @@ salt-master:
{%- if salt_settings.version is defined %} {%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }} - version: {{ salt_settings.version }}
{%- endif %} {%- endif %}
{%- if grains.os_family == 'FreeBSD' %}
- unless: pkg info | grep {{ salt_settings.salt_master }}
{%- endif %}
{% if salt_settings.master_service_details.state != 'ignore' %} {% if salt_settings.master_service_details.state != 'ignore' %}
- require_in: - require_in:
- service: salt-master - service: salt-master

3
salt/minion.sls
View File

@ -71,9 +71,6 @@ salt-minion:
{%- if salt_settings.version %} {%- if salt_settings.version %}
- version: {{ salt_settings.version }} - version: {{ salt_settings.version }}
{%- endif %} {%- endif %}
{%- if grains.os_family == 'FreeBSD' %}
- unless: pkg info | grep {{ salt_settings.salt_master }}
{%- endif %}
{% if salt_settings.minion_service_details.state != 'ignore' %} {% if salt_settings.minion_service_details.state != 'ignore' %}
- require_in: - require_in:
- service: salt-minion - service: salt-minion

18
salt/osmap.yaml
View File

@ -64,15 +64,15 @@ MacOS:
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
FreeBSD: FreeBSD:
salt_master: py37-salt-3002.6 salt_master: py37-salt
salt_minion: py37-salt-3002.6 salt_minion: py37-salt
salt_syndic: py37-salt-3002.6 salt_syndic: py37-salt
salt_cloud: py37-salt-3002.6 salt_cloud: py37-salt
salt_api: py37-salt-3002.6 salt_api: py37-salt
salt_ssh: py37-salt-3002.6 salt_ssh: py37-salt
python_git: py37-GitPython-3.1.11 python_git: py37-GitPython
pygit2: py37-pygit2-1.3.0 pygit2: py37-pygit2
python_dulwich: py37-dulwich-0.19.16 python_dulwich: py37-dulwich
# If `osfingermap.yaml` is introduced in the future, perhaps better to move to there, # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
# since this is probably specific to `OpenBSD-6` # since this is probably specific to `OpenBSD-6`

2
test/integration/v3002-py3/controls/pkgs_spec.rb
View File

@ -5,7 +5,7 @@ pkgs =
when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt-3002.6] %w[py37-salt]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

18
test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
View File

@ -86,9 +86,9 @@ values:
pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2-1.3.0 pygit2: py37-pygit2
python_dulwich: py37-dulwich-0.19.16 python_dulwich: py37-dulwich
python_git: py37-GitPython-3.1.11 python_git: py37-GitPython
release: '3002' release: '3002'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
@ -98,14 +98,14 @@ values:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt-3002.6 salt_api: py37-salt
salt_cloud: py37-salt-3002.6 salt_cloud: py37-salt
salt_master: py37-salt-3002.6 salt_master: py37-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt-3002.6 salt_minion: py37-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt-3002.6 salt_ssh: py37-salt
salt_syndic: py37-salt-3002.6 salt_syndic: py37-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

18
test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
View File

@ -86,9 +86,9 @@ values:
pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2-1.3.0 pygit2: py37-pygit2
python_dulwich: py37-dulwich-0.19.16 python_dulwich: py37-dulwich
python_git: py37-GitPython-3.1.11 python_git: py37-GitPython
release: '3002' release: '3002'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
@ -98,14 +98,14 @@ values:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt-3002.6 salt_api: py37-salt
salt_cloud: py37-salt-3002.6 salt_cloud: py37-salt
salt_master: py37-salt-3002.6 salt_master: py37-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt-3002.6 salt_minion: py37-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt-3002.6 salt_ssh: py37-salt
salt_syndic: py37-salt-3002.6 salt_syndic: py37-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false