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

Fix `repo.saltstack.com` URLs for pinned minor release (#364)
saltstack-formulas · Jan 25, 2019 · 44b06d7 · 44b06d7
2 parents d2668a0 + 68f8d57
commit 44b06d7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/salt/map.jinja b/salt/map.jinja
@@ -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/' +