Skip to content

Commit f5d9a0e

Browse files
ixsathienem
authored andcommitted
Rework of PR #69 to fix Issue #68
Issue #68 raised a valid problem: The postfix formula is using the osmap.yaml file incorrectly. It is being used to filter on the os grain but should instead be filtering on os_family to correctly account for Red Hat/CentOS similarities. PR #69 did the fix in a complex way as it only moved parts of the os mapping into the os_family mapping. This is a much simpler fix, as it just renames the file and uses it as a os_family map, which it actually is. If we really need to differentiate between os flavors inside the os_family at a later date, we can then add a lookup on the os grain. No need to complicate manners now.
1 parent ca6b26e commit f5d9a0e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

postfix/map.jinja

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
# vim: ft=jinja
33

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

77
{% set postfix = salt['grains.filter_by'](
88
defaults,
99
merge=salt['grains.filter_by'](
10-
osmap,
11-
grain='os',
10+
os_familymap,
1211
merge=salt['pillar.get']('postfix:lookup', {}),
1312
),
1413
base='postfix')
File renamed without changes.

0 commit comments

Comments
 (0)