Browse Source

fix(pkgrepo): fix settings for `opensuse`

tags/v0.59.1
Imran Iqbal 5 years ago
parent
commit
f00c9a796a
No account linked to committer's email address
2 changed files with 20 additions and 14 deletions
  1. +18
    -13
      salt/osfamilymap.yaml
  2. +2
    -1
      salt/pkgrepo/suse/install.sls

+ 18
- 13
salt/osfamilymap.yaml View File

# vim: ft=yaml # 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 #from template-formula
{%- if grains.os == 'MacOS' %} {%- 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 %} {%- endif %}


Debian: Debian:
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

+ 2
- 1
salt/pkgrepo/suse/install.sls View File

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

Loading…
Cancel
Save