Add pillar parameter to set the major/minor version of SaltStack repository

[kakwa]

Hello,

It would be nice if there was a way to set the version of saltstack, leveraging the already present versioning in the repository:

For example the saltstack debian repositories provide the following versioned URL:

#pin to Major version
deb http://repo.saltstack.com/apt/debian/8/amd64/2016.11 jessie main

#pin to Minor release
deb http://repo.saltstack.com/apt/debian/8/amd64/archive/2016.11.2 jessie main

Adding a pillar and using it in the map.jinja file could do the job. This pillar can default to latest to retain the current behavior.

Example implementation:

salt:
   - release: '2016.11'

--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -39,7 +39,7 @@ that differ from whats in defaults.yaml
 {% set os_family_map = salt['grains.filter_by']({
     'Debian':  {
       'pkgrepo': 'deb http://repo.saltstack.com/apt/' +
-      salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/latest ' + salt['grains.get']('oscodename') + ' main',
+      salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/' + salt['pillar.get']('salt:release', 'latest') + ' ' + salt['grains.get']('oscodename') + ' main',
       'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/latest/SALTSTACK-GPG-KEY.pub',
       'libgit2': 'libgit2-22',
       'gitfs': {
@@ -138,7 +138,7 @@ that differ from whats in defaults.yaml
   }, merge=salt['grains.filter_by']({
     'Ubuntu':  {
       'pkgrepo': 'deb http://repo.saltstack.com/apt/' +
-      salt['grains.get']('os')|lower + '/' + osrelease + '/amd64/latest ' + salt['grains.get']('oscodename') + ' main',
+      salt['grains.get']('os')|lower + '/' + osrelease + '/amd64/' + salt['pillar.get']('salt:release', 'latest') + ' ' + salt['grains.get']('oscodename') + ' main',
       'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os')|lower + '/' + osrelease + '/amd64/latest/SALTSTACK-GPG-KEY.pub',
       'pygit2': 'python-pygit2',
       'gitfs': {
@@ -153,7 +153,7 @@ that differ from whats in defaults.yaml
     },
     'Raspbian': {
       'pkgrepo': 'deb http://repo.saltstack.com/apt/' +
-      salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/latest ' + salt['grains.get']('oscodename') + ' main',
+      salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/' + salt['pillar.get']('salt:release', 'latest') + ' ' + salt['grains.get']('oscodename') + ' main',
       'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/latest/SALTSTACK-GPG-KEY.pub',
     },
     'SmartOS': {

This implementation seems to work fine on Debian, but I don't have the infrastructure to test it with other distributions/OSes, and I'm not sure it respects the proper guide lines. I'm only providing it as an example.

[daks]

I would really like this feature too.

[aboe76]

could be combined with : #291

[daks]

@aboe76 seems good for me

[aboe76]

@kakwa could you make a PR?

[daks]

@aboe76 isn't #291 already good?

[aboe76]

It's missing some version options for the other salt stuff Op vr 26 mei 2017 09:38 schreef Éric Veiras Galisson < notifications@github.com>:

…

@aboe76 <https://github.com/aboe76> isn't #291 <#291> already good? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#293 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABt51FfcdoGgWK-t4FHv4N4YiwUblhMXks5r9oGRgaJpZM4L5aBk> .

[kakwa]

@aboe76

here is the PR:
#314

It needs some testing before merge, I don't have a testing environment for this.

[aboe76]

@kakwa I will test it tomorrow.

[partsalliance]

is this working for anyone? there is no change when i place release: '2016.3' inside my pillar file

[0xf10e]

@partsalliance I'm sure I've pinned a subset of my minions to 2016.11 and I didn't pull any PR-branches (like #315) for this… Got to check my pillar.

edit: Couldn't find anything like [salt:release] set in my pillars, may have confused it with setting the pkg version in the zabbix-formula.

[aboe76]

@partsalliance can you give us a redacted pillar file of the salt stuff to better understand your issue?
It should work with something like this:

salt:
  release: 2016.3

[aboe76]

close issue, fixed with #358