From f00c9a796a510cc50fcb52994e740866f30288a1 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 19 Sep 2019 01:53:31 +0100
Subject: [PATCH] fix(pkgrepo): fix settings for `opensuse`

---
 salt/osfamilymap.yaml         | 31 ++++++++++++++++++-------------
 salt/pkgrepo/suse/install.sls |  3 ++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
index a007412..24576d9 100644
--- a/salt/osfamilymap.yaml
+++ b/salt/osfamilymap.yaml
@@ -2,23 +2,27 @@
 # vim: ft=yaml
 ---
 
-{% import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
-{% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
-{% set py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
+{%- import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
+{%- set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
+{%- set py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
 
-{% set osrelease = salt['grains.get']('osrelease') %}
-{% set salt_release = salt['pillar.get']('salt:release', 'latest') %}
-{% if salt_release.split('.')|length >= 3 %}
-{% set salt_release = 'archive/' ~ salt_release %}
-{% endif %}
-{% set osfamily_lower =  salt['grains.get']('os_family')|lower %}
-{% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
-{% set oscodename = salt['grains.get']('oscodename') %}
+{%- set osrelease = salt['grains.get']('osrelease') %}
+{#- Workaround for OpenSuse Leap 15.1 until the repo is available #}
+{%- if [grains.os_family, osrelease] == ['Suse', '15.1'] %}
+{%-   set osrelease = '15.0' %}
+{%- endif %}
+{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
+{%- if salt_release.split('.')|length >= 3 %}
+{%-   set salt_release = 'archive/' ~ salt_release %}
+{%- endif %}
+{%- set osfamily_lower =  salt['grains.get']('os_family')|lower %}
+{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
+{%- set oscodename = salt['grains.get']('oscodename') %}
 
 #from template-formula
 {%- if grains.os == 'MacOS' %}
-    {%- set macos_rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %}
-    {%- set macos_rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
+{%-   set macos_rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %}
+{%-   set macos_rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
 {%- endif %}
 
 Debian:
@@ -53,6 +57,7 @@ RedHat:
     gitfs_provider: pygit2
 
 Suse:
+  pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})'
   pkgrepo: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/'
   key_url: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
   pygit2: python-pygit2
diff --git a/salt/pkgrepo/suse/install.sls b/salt/pkgrepo/suse/install.sls
index 115af7e..f87c105 100644
--- a/salt/pkgrepo/suse/install.sls
+++ b/salt/pkgrepo/suse/install.sls
@@ -5,8 +5,9 @@
 salt-pkgrepo-install-saltstack-suse:
   pkgrepo.managed:
     - name: systemsmanagement_saltstack_products
-    - humanname: SaltStack repo for Opensuse 15.x
+    - humanname: {{ salt_settings.pkgrepo_humanname }}
     - baseurl: {{ salt_settings.pkgrepo }}
     - enabled: 1
     - gpgcheck: 1
     - gpgkey: {{ salt_settings.key_url }}
+    - gpgautoimport: true