mirror of
https://github.com/saltstack-formulas/salt-formula.git
synced 2026-11-07 16:44:54 +01:00
fix(suse)!: match newer Leap versions
This commit is contained in:
1 parent
b6b9aa3e8c
commit
a9fe3c2807
2 files changed
+7
-7
No files matched your search
@@ -5,7 +5,7 @@
|
||||
# {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
|
||||
# yamllint disable rule:line-length
|
||||
# {%- set osrelease = salt['grains.get']('osrelease', '') %}
|
||||
# {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
|
||||
# {%- set opensuse_repo = osrelease if salt['grains.get']('osfinger', '').startswith('Leap-') else 'openSUSE_Tumbleweed' %}
|
||||
# {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
|
||||
# {%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
|
||||
# yamllint enable rule:line-length
|
||||
@@ -57,11 +57,11 @@ RedHat:
|
||||
|
||||
Suse:
|
||||
pkgrepo_humanname:
|
||||
'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
|
||||
'Salt releases for SLE-based SUSE products ({{ opensuse_repo }})'
|
||||
pkgrepo: "https://download.opensuse.org/repositories/systemsmanagement:\
|
||||
/saltstack/openSUSE_{{ opensuse_repo_suffix }}/"
|
||||
/saltstack/{{ opensuse_repo }}/"
|
||||
key_url: "https://download.opensuse.org/repositories/systemsmanagement:\
|
||||
/saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key"
|
||||
/saltstack/{{ opensuse_repo }}/repodata/repomd.xml.key"
|
||||
pygit2: python3-pygit2
|
||||
pyinotify: python-pyinotify
|
||||
gitfs:
|
||||
|
||||
@@ -41,7 +41,7 @@ values:
|
||||
version: 0.23.0
|
||||
version: 0.23.0
|
||||
install_packages: true
|
||||
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.6/repodata/repomd.xml.key
|
||||
key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/16.0/repodata/repomd.xml.key
|
||||
master:
|
||||
ext_pillar:
|
||||
- cmd_yaml: cat /etc/salt/yaml
|
||||
@@ -86,8 +86,8 @@ values:
|
||||
state: running
|
||||
parallel: true
|
||||
pin_version: false
|
||||
pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.6/
|
||||
pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.6)
|
||||
pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/16.0/
|
||||
pkgrepo_humanname: Salt releases for SLE-based SUSE products (16.0)
|
||||
py_ver: py3
|
||||
pygit2: python3-pygit2
|
||||
pyinotify: python-pyinotify
|
||||
|
||||
Reference in new issue
Block a user