Add OS grain filter_by. Move Fedora to osmap

postgres/map.jinja

@@ -1,5 +1,6 @@
 {% import_yaml "postgres/defaults.yaml" as defaults %}
 {% import_yaml "postgres/osfamilymap.yaml" as osfamilymap %}
+{% import_yaml "postgres/osmap.yaml" as osmap %}
 {% import_yaml "postgres/codenamemap.yaml" as oscodenamemap %}
 
 {% set postgres = salt['grains.filter_by'](
@@ -8,9 +9,13 @@
         osfamilymap,
         grain='os_family',
         merge=salt['grains.filter_by'](
-            oscodenamemap,
-            grain='oscodename',
-            merge=salt['pillar.get']('postgres', {}),
+            osmap,
+            grain='os',
+            merge=salt['grains.filter_by'](
+                oscodenamemap,
+                grain='oscodename',
+                merge=salt['pillar.get']('postgres', {}),
+            ),
         ),
     ),
     base='postgres',