Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update osmap.yaml to support Ubuntu versions greater than 22.04 #562

Closed
wants to merge 1 commit into from
Closed

Update osmap.yaml to support Ubuntu versions greater than 22.04 #562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions salt/osmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
Loading