From fb63199a844cb377329e4281dba3db0a3856f906 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Aug 13 2019 11:40:07 +0000
Subject: Merge branch 'releasever' into 'production'


Switch 3 more repos to $releasever

See merge request infra/salt!255
---

diff --git a/pillar/osfullname/Leap.sls b/pillar/osfullname/Leap.sls
index 12cc6af..b0b0bf7 100644
--- a/pillar/osfullname/Leap.sls
+++ b/pillar/osfullname/Leap.sls
@@ -1,5 +1,3 @@
-{% set osrelease = salt['grains.get']('osrelease') %}
-
 zypper:
   repositories:
     repo-oss:
diff --git a/pillar/role/common/wiki.sls b/pillar/role/common/wiki.sls
index 00bd152..d00c767 100644
--- a/pillar/role/common/wiki.sls
+++ b/pillar/role/common/wiki.sls
@@ -8,7 +8,7 @@ sudoers:
 zypper:
   repositories:
     openSUSE:infrastructure:wiki:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/wiki/openSUSE_Leap_$releasever/
       gpgcheck: 0
       priority: 100
       refresh: True
diff --git a/pillar/role/postgresql.sls b/pillar/role/postgresql.sls
index 16836eb..82aa3a3 100644
--- a/pillar/role/postgresql.sls
+++ b/pillar/role/postgresql.sls
@@ -35,6 +35,6 @@ zypper:
     monitoring-plugins-postgres: {}
   repositories:
     server_database_postgresql:
-      baseurl: http://download.infra.opensuse.org/repositories/server:/database:/postgresql/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
+      baseurl: http://download.infra.opensuse.org/repositories/server:/database:/postgresql/openSUSE_Leap_$releasever/
       priority: 99
       refresh: True
diff --git a/pillar/role/web_elections.sls b/pillar/role/web_elections.sls
index 5f6e488..3004a33 100644
--- a/pillar/role/web_elections.sls
+++ b/pillar/role/web_elections.sls
@@ -55,6 +55,6 @@ profile:
 zypper:
   repositories:
     openSUSE:infrastructure:elections.opensuse.org:
-      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/elections.opensuse.org/openSUSE_Leap_{{ salt['grains.get']('osrelease') }}/
+      baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/elections.opensuse.org/openSUSE_Leap_$releasever/
       priority: 100
       refresh: True