From 0ff48e10218ac5f4d3467c2be5d3de43e10b6305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Mon, 27 May 2019 12:31:13 -0300
Subject: [PATCH] fix(map.jinja+tests): add correct keyring for the OS

* Use the correct keyring for the OS (a refactor of the changes suggested in #41)
---
 apt/map.jinja | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apt/map.jinja b/apt/map.jinja
index 1e23205..ed3091c 100644
--- a/apt/map.jinja
+++ b/apt/map.jinja
@@ -35,4 +35,12 @@
           },
         },
     },
-}, merge=salt['pillar.get']('apt:lookup'), default='Debian') %}
+}, merge=salt['grains.filter_by']({
+}, grain='oscodename', merge=salt['grains.filter_by']({
+    'Ubuntu': {
+         'keyring_package': 'ubuntu-keyring'
+    },
+    'Mint': {
+         'keyring_package': 'linuxmint-keyring'
+    },
+}, merge=salt['pillar.get']('apt:lookup'), default='Debian'))) %}