Merge pull request #79 from bawuenet/osfamily_rework

Rework of PR #69 to fix Issue #68
2018-10-04 12:05:47 -03:00 · 2018-10-04 12:05:47 -03:00 · 99efe7e0d9
commit 99efe7e0d9
parent ca6b26e3ed f5d9a0e95d
2 changed files with 2 additions and 3 deletions
--- a/postfix/map.jinja
+++ b/postfix/map.jinja
@ -2,13 +2,12 @@
 # vim: ft=jinja

 {% import_yaml "postfix/defaults.yaml" as defaults %}
-{% import_yaml "postfix/osmap.yaml" as osmap %}
+{% import_yaml "postfix/osfamilymap.yaml" as os_familymap %}

 {% set postfix = salt['grains.filter_by'](
    defaults,
    merge=salt['grains.filter_by'](
-        osmap,
-        grain='os',
+        os_familymap,
        merge=salt['pillar.get']('postfix:lookup', {}),
    ),
    base='postfix')
--- a/postfix/osfamilymap.yaml
+++ b/postfix/osfamilymap.yaml