moved upstream repo to an include, checked for Ubuntu before attempting to add it

postgres/client.sls

@@ -1,15 +1,8 @@
 {% from "postgres/map.jinja" import postgres with context %}
 
 {% if salt['pillar.get']('postgres:use_upstream_repo') %}
-install-postgresql-repo:
-  pkgrepo.managed:
-    - humanname: PostgreSQL Official Repository
-    - name: {{ postgres.pkg_repo }}
-    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-    - keyserver: keyserver.ubuntu.com
-    - file: {{ postgres.pkg_repo_file }}
-    - require_in:
-        - install-postgresql-client
+include:
+  - postgres.upstream
 {% endif %}
 
 install-postgresql-client:

postgres/init.sls

@@ -1,15 +1,8 @@
 {% from "postgres/map.jinja" import postgres with context %}
 
 {% if salt['pillar.get']('postgres:use_upstream_repo') %}
-install-postgresql-repo:
-  pkgrepo.managed:
-    - humanname: PostgreSQL Official Repository
-    - name: {{ postgres.pkg_repo }}
-    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
-    - keyserver: keyserver.ubuntu.com
-    - file: {{ postgres.pkg_repo_file }}
-    - require_in:
-        - install-postgresql
+include:
+  - postgres.upstream
 {% endif %}
 
 install-postgresql:

postgres/upstream.sls

@@ -0,0 +1,11 @@
+{% from "postgres/map.jinja" import postgres with context %}
+
+{% if grains['os'] == 'Ubuntu' %} # Other distro support should be added here
+install-postgresql-repo:
+  pkgrepo.managed:
+    - humanname: PostgreSQL Official Repository
+    - name: {{ postgres.pkg_repo }}
+    - keyid: B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
+    - keyserver: keyserver.ubuntu.com
+    - file: {{ postgres.pkg_repo_file }}
+{% endif %}