Introduce osmajorreleasemap for RedHat release specific commands

postgres/map.jinja

@@ -1,22 +1,22 @@
 {% import_yaml "postgres/defaults.yaml" as defaults %}
 {% import_yaml "postgres/osmap.yaml" as osmap %}
 {% import_yaml "postgres/codenamemap.yaml" as oscodenamemap %}
-{% import_yaml "postgres/osfingermap.yaml" as osfingermap %}
+{% import_yaml "postgres/osmajorreleasemap.yaml" as osmajorreleasemap %}
 
-{% set _postgres = salt['grains.filter_by'](
-    osmap,
-    grain='os_family',
+{% set postgres = salt['grains.filter_by'](
+    defaults,
     merge=salt['grains.filter_by'](
-        oscodenamemap,
-        grain='oscodename',
+        osmap,
+        grain='os_family',
         merge=salt['grains.filter_by'](
-            osfingermap,
-            grain='osfinger',
-            merge=salt['pillar.get']('postgres', {})
-        )
-    )
+            oscodenamemap,
+            grain='oscodename',
+            merge=salt['grains.filter_by'](
+                osmajorreleasemap,
+                grain='osmajorrelease',
+                merge=salt['pillar.get']('postgres', {}),
+            ),
+        ),
+    ),
+    base='postgres',
 ) %}
-
-{% do defaults.postgres.update(_postgres) %}
-
-{% set postgres = defaults.postgres %}