Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-06 12:45:11 +02:00
Code Issues Activity

chore(pkgrepo): Set appropriate defaults for py_ver_repr

Browse Source
This commit is contained in:
Justin Zandbergen 2024-04-25 13:26:38 +02:00
parent c8eb9b3a8f
commit 35f032a22d
No known key found for this signature in database
GPG Key ID: 2AA3406BA4B5EB37
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
salt/osmap.yaml
View File

@ -2,7 +2,6 @@
# vim: ft=yaml
---
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') | string %}
@ -22,17 +21,30 @@
{%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %}
{%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %}
{%- set default_repo_keyring_hash = 'sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472' %}
{%- set default_pyver_or_apt = 'py3' %}
{%- set default_pyver_or_yum = 'py3' %}
{%- else %}
{%- set default_repo = 'https://repo.saltproject.io' %}
{%- set default_repo_keyring_filename = 'salt-archive-keyring.gpg' %}
{%- set default_repo_pubkey_filename = 'SALTSTACK-GPG-KEY.pub' %}
{%- set default_repo_keyring_hash = 'sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47' %}
{%- set default_pyver_or_apt = 'apt' %}
{%- set default_pyver_or_yum = 'yum' %}
{%- endif %}
{%- set salt_repo = salt['pillar.get']('salt:repo', default_repo) %}
{%- set salt_repo_keyring_filename = salt['pillar.get']('salt:repo_keyring_filename', default_repo_keyring_filename) %}
{%- set salt_repo_pubkey_filename = salt['pillar.get']('salt:repo_keyring_filename', default_repo_pubkey_filename) %}
{%- set salt_repo_keyring_hash = salt['pillar.get']('salt:repo_keyring_hash', default_repo_keyring_hash) %}
{%- if os_family_lower in ["amazon"] %}
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', default_pyver_or_yum) %}
{%- elif os_family_lower in ["ubuntu", "raspbian"] %}
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', default_pyver_or_apt) %}
{%- else %}
{%- set py_ver_repr = 'py3' %}
{%- endif %}
Fedora:
pygit2: python2-pygit2