saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

fix(pkgrepo): fix settings for opensuse

Browse Source
This commit is contained in:
Imran Iqbal 2019-09-19 01:53:31 +01:00
parent 978e640cf3
commit f00c9a796a
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/osfamilymap.yaml
View File

@ -2,18 +2,22 @@
# vim: ft=yaml # vim: ft=yaml
--- ---
{% import_yaml "salt/ospyvermap.yaml" as ospyvermap %} {%- import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
{% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %} {%- 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 py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
{% set osrelease = salt['grains.get']('osrelease') %} {%- set osrelease = salt['grains.get']('osrelease') %}
{% set salt_release = salt['pillar.get']('salt:release', 'latest') %} {#- Workaround for OpenSuse Leap 15.1 until the repo is available #}
{% if salt_release.split('.')|length >= 3 %} {%- if [grains.os_family, osrelease] == ['Suse', '15.1'] %}
{% set salt_release = 'archive/' ~ salt_release %} {%- set osrelease = '15.0' %}
{% endif %} {%- endif %}
{% set osfamily_lower = salt['grains.get']('os_family')|lower %} {%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
{% set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- if salt_release.split('.')|length >= 3 %}
{% set oscodename = salt['grains.get']('oscodename') %} {%- 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 #from template-formula
{%- if grains.os == 'MacOS' %} {%- if grains.os == 'MacOS' %}
@ -53,6 +57,7 @@ RedHat:
gitfs_provider: pygit2 gitfs_provider: pygit2
Suse: Suse:
pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})'
pkgrepo: 'http://repo.saltstack.com/opensuse/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' key_url: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
pygit2: python-pygit2 pygit2: python-pygit2

3
salt/pkgrepo/suse/install.sls
View File

@ -5,8 +5,9 @@
salt-pkgrepo-install-saltstack-suse: salt-pkgrepo-install-saltstack-suse:
pkgrepo.managed: pkgrepo.managed:
- name: systemsmanagement_saltstack_products - name: systemsmanagement_saltstack_products
- humanname: SaltStack repo for Opensuse 15.x - humanname: {{ salt_settings.pkgrepo_humanname }}
- baseurl: {{ salt_settings.pkgrepo }} - baseurl: {{ salt_settings.pkgrepo }}
- enabled: 1 - enabled: 1
- gpgcheck: 1 - gpgcheck: 1
- gpgkey: {{ salt_settings.key_url }} - gpgkey: {{ salt_settings.key_url }}
- gpgautoimport: true