Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #234 from rhertzog/pkgrepo-update 

Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
This commit is contained in:
Forrest 2016-06-30 09:21:18 -07:00 committed by GitHub
parent 137868bcc1 ee06702fca
commit 5f03ce9db1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/map.jinja
View File

@ -8,10 +8,12 @@
Setup variable using grains['os_family'] based logic, only add key:values here Setup variable using grains['os_family'] based logic, only add key:values here
that differ from whats in defaults.yaml that differ from whats in defaults.yaml
##} ##}
{% set osrelease = salt['grains.get']('osrelease') %}
{% set os_family_map = salt['grains.filter_by']({ {% set os_family_map = salt['grains.filter_by']({
'Debian': { 'Debian': {
'pkgrepo': 'deb http://debian.saltstack.com/debian ' + salt['grains.get']('oscodename') + '-saltstack main', 'pkgrepo': 'deb http://repo.saltstack.com/apt/' +
'key_url': 'salt://salt/pkgrepo/debian/saltstack.gpg', salt['grains.get']('os')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/amd64/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', 'libgit2': 'libgit2-22',
'gitfs': { 'gitfs': {
'pygit2': { 'pygit2': {