Skip to content

Commit

Permalink
Fix repo.saltstack.com URLs for pinned minor release (saltstack-for…
Browse files Browse the repository at this point in the history
…mulas#364)

* All minor releases appear in an `archive` sub-directory.
* Resolves main bug in GitHub issue saltstack-formulas#364.
* Simplification of original GitHub PR saltstack-formulas#365 by @ralucasg.
  • Loading branch information
ralucasg authored and myii committed Jan 25, 2019
1 parent d2668a0 commit 68f8d57
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions salt/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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/' +
Expand Down

0 comments on commit 68f8d57

Please sign in to comment.