saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #401 from dafyddj/use-os_family-for-pkgrepo

Browse Source 
Make pkgrepo work for Debian derivatives without their own repos
This commit is contained in:
Niels Abspoel 2019-02-11 21:36:08 +01:00 committed by GitHub
commit 20e893bec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/osfamilymap.yaml
View File

@ -10,13 +10,13 @@
{% if salt_release.split('.')|length >= 3 %} {% if salt_release.split('.')|length >= 3 %}
{% set salt_release = 'archive/' ~ salt_release %} {% set salt_release = 'archive/' ~ salt_release %}
{% endif %} {% endif %}
{% set os_lower = salt['grains.get']('os')|lower %} {% set osfamily_lower = salt['grains.get']('os_family')|lower %}
{% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{% set oscodename = salt['grains.get']('oscodename') %} {% set oscodename = salt['grains.get']('oscodename') %}
Debian: Debian:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs: