Skip to content

Commit

Permalink
fix(freebsd): fix package names [skip ci]
Browse files Browse the repository at this point in the history
Resolves issues introduced in 24ebbb4.
  • Loading branch information
myii committed Apr 4, 2021
1 parent 26f2cc1 commit a30f124
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 34 deletions.
3 changes: 0 additions & 3 deletions salt/master.sls
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ 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
Expand Down
3 changes: 0 additions & 3 deletions salt/minion.sls
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ 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
Expand Down
18 changes: 9 additions & 9 deletions salt/osmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ MacOS:
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
salt_master: py37-salt
salt_minion: py37-salt
salt_syndic: py37-salt
salt_cloud: py37-salt
salt_api: py37-salt
salt_ssh: py37-salt
python_git: py37-GitPython
pygit2: py37-pygit2
python_dulwich: py37-dulwich

# If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
# since this is probably specific to `OpenBSD-6`
Expand Down
2 changes: 1 addition & 1 deletion test/integration/v3002-py3/controls/pkgs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
when 'arch'
%w[salt]
when /bsd$/
%w[py37-salt-3002.6]
%w[py37-salt]
when 'windows'
%w[Salt\ Minion]
else
Expand Down
18 changes: 9 additions & 9 deletions test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ values:
pin_version: false
pkgrepo: ''
py_ver: py3
pygit2: py37-pygit2-1.3.0
python_dulwich: py37-dulwich-0.19.16
python_git: py37-GitPython-3.1.11
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
release: '3002'
restart_via_at: false
retry_options:
Expand All @@ -98,14 +98,14 @@ values:
until: true
rootgroup: wheel
rootuser: root
salt_api: py37-salt-3002.6
salt_cloud: py37-salt-3002.6
salt_master: py37-salt-3002.6
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_master_macos_plist_hash: ''
salt_minion: py37-salt-3002.6
salt_minion: py37-salt
salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt-3002.6
salt_syndic: py37-salt-3002.6
salt_ssh: py37-salt
salt_syndic: py37-salt
ssh_roster: {}
syndic_service: salt_syndic
use_pip: false
Expand Down
18 changes: 9 additions & 9 deletions test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ values:
pin_version: false
pkgrepo: ''
py_ver: py3
pygit2: py37-pygit2-1.3.0
python_dulwich: py37-dulwich-0.19.16
python_git: py37-GitPython-3.1.11
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
release: '3002'
restart_via_at: false
retry_options:
Expand All @@ -98,14 +98,14 @@ values:
until: true
rootgroup: wheel
rootuser: root
salt_api: py37-salt-3002.6
salt_cloud: py37-salt-3002.6
salt_master: py37-salt-3002.6
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_master_macos_plist_hash: ''
salt_minion: py37-salt-3002.6
salt_minion: py37-salt
salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt-3002.6
salt_syndic: py37-salt-3002.6
salt_ssh: py37-salt
salt_syndic: py37-salt
ssh_roster: {}
syndic_service: salt_syndic
use_pip: false
Expand Down

0 comments on commit a30f124

Please sign in to comment.