2
0

Merge pull request #394 from myii/PR_364-archive-dir-for-minor-release

Fix `repo.saltstack.com` URLs for pinned minor release (#364)
This commit is contained in:
Niels Abspoel 2019-01-25 20:12:05 +01:00 committed by GitHub
commit 44b06d70b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,6 +41,12 @@ that differ from whats in defaults.yaml
##}
{% set osrelease = salt['grains.get']('osrelease') %}
{% set salt_release = salt['pillar.get']('salt:release', 'latest') %}
{# All minor releases appear in an `archive` sub-directory #}
{% if salt_release.split('.')|length >= 3 %}
{% set salt_release = 'archive/' ~ salt_release %}
{% endif %}
{% set os_family_map = salt['grains.filter_by']({
'Debian': {
'pkgrepo': 'deb http://repo.saltstack.com/apt/' +