From 94ca64fb0cf982f8a5b2a7e457ad61ca363f313c Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jul 15 2019 21:24:19 +0000
Subject: Merge branch 'cboltz-postgresql' into 'production'


postgresql role: whitelist packages from server:database:postgresql

See merge request infra/salt!250
---

diff --git a/pillar/role/postgresql.sls b/pillar/role/postgresql.sls
index 7bddaa5..16836eb 100644
--- a/pillar/role/postgresql.sls
+++ b/pillar/role/postgresql.sls
@@ -7,6 +7,25 @@ profile:
       check_postgres_locks: "/usr/lib/nagios/plugins/check_postgres_locks --warning='60' --critical='total=50:waiting=1:exclusive=20'"
       check_postgres_wal_files: "/usr/lib/nagios/plugins/check_postgres_wal_files --critical='120' --warning='100'"
 
+    {% set osrelease = salt['grains.get']('osrelease') %}
+    {% if osrelease == '15.0' %}
+    check_zypper:
+      whitelist:
+        # packages from server:database:postgresql
+        - libpq5
+        - postgresql
+        - postgresql-contrib
+        - postgresql-llvmjit
+        - postgresql-server
+        - postgresql11
+        - postgresql11-contrib
+        - postgresql11-ip4r
+        - postgresql11-llvmjit
+        - postgresql11-repmgr
+        - postgresql11-server
+        - repmgr
+    {% endif %}
+
 zypper:
   packages:
     postgresql: {}
@@ -14,4 +33,8 @@ zypper:
     postgresql-contrib: {}
     postgresql-server: {}
     monitoring-plugins-postgres: {}
-
+  repositories:
+    server_database_postgresql:
+      baseurl: http://download.infra.opensuse.org/repositories/server:/database:/postgresql/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
+      priority: 99
+      refresh: True