Browse Source

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

Make pkgrepo work for Debian derivatives without their own repos
tags/v0.57.0
Niels Abspoel 6 years ago
parent
commit
20e893bec9
No account linked to committer's email address
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      salt/osfamilymap.yaml

+ 3
- 3
salt/osfamilymap.yaml View File

{% 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'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
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 }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:

Loading…
Cancel
Save