Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-28 02:57:50 +01:00
Code Issues Activity

Merge pull request #245 from UGNS/raspbian

Browse Source 
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
This commit is contained in:
Niels Abspoel 2016-08-15 16:44:27 +02:00 committed by GitHub
commit 39a329b693
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/map.jinja
View File

@ -94,7 +94,18 @@ that differ from whats in defaults.yaml
'config_path': 'C:\salt\conf',
'minion_service': 'salt-minion',
},
}, grain="os_family", merge=salt['pillar.get']('salt:lookup'))
}, 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',
'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os')|lower + '/' + osrelease + '/amd64/latest/SALTSTACK-GPG-KEY.pub',
},
'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',
'key_url': 'https://repo.saltstack.com/apt/' + salt['grains.get']('os_family')|lower + '/' + salt['grains.get']('osmajorrelease', osrelease) + '/armhf/latest/SALTSTACK-GPG-KEY.pub',
},
}, grain='os', merge=salt['pillar.get']('salt:lookup')))
%}
{## Merge the flavor_map to the default settings ##}

2
salt/pkgrepo/init.sls
View File

@ -1,6 +1,6 @@
{% set name = {
'RedHat': 'redhat',
'Debian': grains['os']|lower,
'Debian': grains['os_family']|lower,
}.get(grains.os_family) %}
include:
- .{{ name }}