Skip to content

Commit b333369

Browse files
SMillerDevsticky-note
SMillerDev
authored and
sticky-note
committed
fix(repos): fix namings after salt binaries and keys move
BREAKING CHANGES: This commit changes upstream repository naming conventions to get latest binaries and keys. If you depends on versions of salt from older, please stick with version 1.x.x of this formula
1 parent 570c44b commit b333369

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

‎docs/README.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ salt-formula
1616

1717
Yes, Salt can Salt itself!
1818

19+
## Note: As for salt `3006` and new `onedir` distribution method,
20+
upstream repositories of saltstack have changed naming conventions
21+
to get latest binaries and keys.
22+
If you depends on versions of salt from older repositories,
23+
please stick with version 1.x.x of this formula.
24+
1925
.. contents:: **Table of Contents**
2026

2127
General notes
@@ -134,7 +140,7 @@ Git repositories under ``/srv/formulas`` and makes them available in the relevan
134140
'saltmain':
135141
- salt.formulas
136142
- salt.master
137-
143+
138144

139145
Pillar data can be used to customize all paths, URLs, etc. Here's a minimal pillar sample installing two formulas in the base environment:
140146

‎salt/defaults.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
salt:
55
version: ''
66
pin_version: false
7-
py_ver: '' ## py2 is default
7+
py_ver: 'py3' ## py3 is default
88
rootuser: root
99
rootgroup: root
1010
install_packages: true

‎salt/osfamilymap.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
66

7+
{%- set repoarch = 'amd64' if salt['grains.get']('osarch', '') == 'x86_64' else 'arm64' %}
78
{%- set osrelease = salt['grains.get']('osrelease', '') %}
89
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
910
{%- if salt_release.split('.')|length >= 3 %}
@@ -13,7 +14,7 @@
1314
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
1415
{%- set oscodename = salt['grains.get']('oscodename') %}
1516
{%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
16-
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
17+
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io/salt') %}
1718

1819
#from template-formula
1920
{%- if grains.os_family == 'MacOS' %}
@@ -25,8 +26,8 @@
2526

2627

2728
Debian:
28-
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
29-
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
29+
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch={{ repoarch }}] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/{{ repoarch }}/{{ salt_release }} {{ oscodename }} main'
30+
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.pub'
3031
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
3132
libgit2: libgit2-22
3233
pyinotify: python-pyinotify
@@ -43,8 +44,8 @@ Debian:
4344
RedHat:
4445
pkgrepo_name: saltstack
4546
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
46-
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}'
47-
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
47+
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}'
48+
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.pub'
4849
pygit2: python-pygit2
4950
python_git: GitPython
5051
gitfs:

‎salt/osfingermap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414

1515
Oracle Linux Server-7:
1616
pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }}
17-
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}'
18-
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
17+
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}'
18+
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.pub'

‎salt/osmap.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
66

7+
{%- set repoarch = 'amd64' if salt['grains.get']('osarch', '') == 'x86_64' else 'arm64' %}
78
{%- set osrelease = salt['grains.get']('osrelease', '') %}
89
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
910
{%- if salt_release.split('.')|length >= 3 %}
@@ -13,22 +14,22 @@
1314
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
1415
{%- set oscodename = salt['grains.get']('oscodename') %}
1516
{%- set os_family_lower = salt['grains.get']('os_family')|lower %}
16-
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
17+
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io/salt') %}
1718

1819
Fedora:
1920
pygit2: python2-pygit2
2021

2122
Amazon:
2223
pkgrepo_name: saltstack-amzn-repo
2324
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
24-
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}'
25-
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
25+
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}'
26+
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.pub'
2627

2728
Ubuntu:
28-
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'
29-
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
29+
pkgrepo: 'deb [signed-by=/usr/share/keyrings/SALT-PROJECT-GPG-PUBKEY-2023.gpg arch={{ repoarch }}] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/{{ repoarch }}/{{ salt_release }} {{ oscodename }} main'
30+
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
3031
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
31-
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
32+
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
3233
pygit2: python-pygit2
3334
gitfs:
3435
pygit2:
@@ -39,7 +40,7 @@ Ubuntu:
3940

4041
Raspbian:
4142
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=armhf] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
42-
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring.gpg'
43+
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
4344

4445
SmartOS:
4546
salt_master: salt

0 commit comments

Comments
 (0)