From 1f0cefdb782b5dc453186a5c66c2d725eceb1b7d Mon Sep 17 00:00:00 2001 From: Imran Iqbal <iqbalmy@hotmail.com> Date: Tue, 16 Apr 2019 23:00:35 +0100 Subject: [PATCH] fix(windows): use correct `salt-minion` package name * From `salt-winrepo-ng`: + https://github.com/saltstack/salt-winrepo-ng/blob/master/salt-minion-py2.sls - Package: `salt-minion` + https://github.com/saltstack/salt-winrepo-ng/blob/master/salt-minion-py3.sls - Package: `salt-minion-py3` * Close #411 --- salt/osfamilymap.yaml | 2 +- salt/ospyvermap.yaml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index abe1612..b0a5fc0 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -117,7 +117,7 @@ OpenBSD: python_git: py-GitPython Windows: - salt_minion: salt-minion + salt_minion: salt-minion{{ py_ver_repr }} config_path: 'C:\salt\conf' minion_service: salt-minion diff --git a/salt/ospyvermap.yaml b/salt/ospyvermap.yaml index 8e32918..8b6cfda 100644 --- a/salt/ospyvermap.yaml +++ b/salt/ospyvermap.yaml @@ -21,9 +21,13 @@ FreeBSD: {} 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: - py2: 'Py2' - py3: 'Py3' + py2: '' + py3: '-py3' MacOS: py2: 'py2'