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

2015-04-21 15:13:42 -07:00
parent c62b41524d
commit 7ddfbb22e6
3 changed files with 15 additions and 18 deletions
--- a/postgres/client.sls
+++ b/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: