Merge pull request #79 from bawuenet/osfamily_rework
Rework of PR #69 to fix Issue #68
This commit is contained in:
commit
99efe7e0d9
@ -2,13 +2,12 @@
|
|||||||
# vim: ft=jinja
|
# vim: ft=jinja
|
||||||
|
|
||||||
{% import_yaml "postfix/defaults.yaml" as defaults %}
|
{% 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'](
|
{% set postfix = salt['grains.filter_by'](
|
||||||
defaults,
|
defaults,
|
||||||
merge=salt['grains.filter_by'](
|
merge=salt['grains.filter_by'](
|
||||||
osmap,
|
os_familymap,
|
||||||
grain='os',
|
|
||||||
merge=salt['pillar.get']('postfix:lookup', {}),
|
merge=salt['pillar.get']('postfix:lookup', {}),
|
||||||
),
|
),
|
||||||
base='postfix')
|
base='postfix')
|
||||||
|
Loading…
Reference in New Issue
Block a user