From 70491364bddcae069dd82ba86cb214edb75b5a4f Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Wed, 28 Mar 2018 12:29:45 +0100
Subject: [PATCH] Add OS grain filter_by. Move Fedora to osmap

---
 postgres/map.jinja        | 11 ++++++++---
 postgres/osfamilymap.yaml |  4 ----
 postgres/osmap.yaml       |  7 +++++++
 3 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 postgres/osmap.yaml

diff --git a/postgres/map.jinja b/postgres/map.jinja
index b0b364f..55c0449 100644
--- a/postgres/map.jinja
+++ b/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',
diff --git a/postgres/osfamilymap.yaml b/postgres/osfamilymap.yaml
index 6785a75..7d3fede 100644
--- a/postgres/osfamilymap.yaml
+++ b/postgres/osfamilymap.yaml
@@ -30,11 +30,7 @@ RedHat:
     humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
     gpgcheck: 1
     gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
-    {% if grains.os == 'Fedora' %}
-    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/fedora/fedora-$releasever-$basearch'
-    {% else %}
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'
-    {% endif %}
 
 {% if repo.use_upstream_repo == true %}
   {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}
diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
new file mode 100644
index 0000000..cfa6028
--- /dev/null
+++ b/postgres/osmap.yaml
@@ -0,0 +1,7 @@
+{% import_yaml "postgres/repo.yaml" as repo %}
+
+Fedora:
+  pkg_repo:
+    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/fedora/fedora-$releasever-$basearch'
+
+# vim: ft=sls