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

Update osmap.yaml to support Ubuntu versions greater than 22.04

Browse Source
This commit is contained in:
David Bierce 2024-03-30 21:14:48 -05:00 committed by GitHub
parent 570c44b166
commit 05897c85ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/osmap.yaml
View File

@ -13,6 +13,7 @@
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{%- set oscodename = salt['grains.get']('oscodename') %}
{%- set os_family_lower = salt['grains.get']('os_family')|lower %}
{%- set osarch_lower = salt['grains.get']('repoarch')|lower %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
Fedora:
@ -25,10 +26,17 @@ Amazon:
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
Ubuntu:
{%- if os == 'Ubuntu' and osmajorrelease >= '22' -%}
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch={{ repoarch }}] {{ salt_repo }}/salt/{{ py_ver_repr }}/{{ os_lower }}/{{ osrelease }}/{{ osarch_lower }}/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: "{{ salt_repo }}/salt/{{ py_ver_repr ))/{{ os_lower }}/{{ osrelease }}/{{ osarch_lower }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg"
key_url: '{{ salt_repo }}/{{ py_ver_repr }}/{{ os_lower }}/{{ osrelease }}/{{ repoarch }}/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.pub'
pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
{%- else -%}
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
{%- endif -%}
pygit2: python-pygit2
gitfs:
pygit2: