From a0e0a65e1876fda68b2f923bacab33b438eac6e4 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Mon, 11 Feb 2019 16:55:21 +0000 Subject: [PATCH] osfamily map: make pkgrepo work for Debian derivatives without their own repos e.g. TurnKey Linux amongst others --- salt/osfamilymap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index d824681..7852dee 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -10,13 +10,13 @@ {% if salt_release.split('.')|length >= 3 %} {% set salt_release = 'archive/' ~ salt_release %} {% 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 oscodename = salt['grains.get']('oscodename') %} 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 pyinotify: python-pyinotify gitfs: