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

Merge pull request #412 from myii/bug/fix-windows-py3

Browse Source 
fix(windows): use correct `salt-minion` package name
This commit is contained in:
Niels Abspoel 2019-04-19 15:29:30 +02:00 committed by GitHub
commit 0ba5261e1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/osfamilymap.yaml
View File

@ -3,7 +3,7 @@
{% import_yaml "salt/ospyvermap.yaml" as ospyvermap %} {% import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
{% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %} {% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
{% set py_ver_dir = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %} {% set py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
{% set osrelease = salt['grains.get']('osrelease') %} {% set osrelease = salt['grains.get']('osrelease') %}
{% set salt_release = salt['pillar.get']('salt:release', 'latest') %} {% set salt_release = salt['pillar.get']('salt:release', 'latest') %}
@ -15,8 +15,8 @@
{% set oscodename = salt['grains.get']('oscodename') %} {% set oscodename = salt['grains.get']('oscodename') %}
Debian: Debian:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:
@ -30,8 +30,8 @@ Debian:
install_from_source: False install_from_source: False
RedHat: RedHat:
pkgrepo: 'https://repo.saltstack.com/{{ py_ver_dir }}/redhat/$releasever/$basearch/{{ salt_release }}' pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2 pygit2: python-pygit2
python_git: GitPython python_git: GitPython
gitfs: gitfs:
@ -117,7 +117,7 @@ OpenBSD:
python_git: py-GitPython python_git: py-GitPython
Windows: Windows:
salt_minion: salt-minion salt_minion: salt-minion{{ py_ver_repr }}
config_path: 'C:\salt\conf' config_path: 'C:\salt\conf'
minion_service: salt-minion minion_service: salt-minion

8
salt/ospyvermap.yaml
View File

@ -21,9 +21,13 @@ FreeBSD: {}
OpenBSD: {} OpenBSD: {}
# This is *not* used directly with https://repo.saltstack.com
# Rather, this is used with `salt-winrepo-ng`, where the package names are:
# * py2: salt-minion
# * py3: salt-minion-py3
Windows: Windows:
py2: 'Py2' py2: ''
py3: 'Py3' py3: '-py3'
MacOS: MacOS:
py2: 'py2' py2: 'py2'