Merge pull request #521 from hkbakke/master
Fix repo management on Debian Bullseye and newer.
This commit is contained in:
commit
04a2253ba6
|
@ -14,7 +14,7 @@ salt:
|
||||||
master_remove_config: true
|
master_remove_config: true
|
||||||
|
|
||||||
# Set this to 'py3' to install the Python 3 packages.
|
# Set this to 'py3' to install the Python 3 packages.
|
||||||
# If this is not set, the Python 2 packages will be installed by default.
|
# The default varies between OS versions.
|
||||||
py_ver: 'py3'
|
py_ver: 'py3'
|
||||||
|
|
||||||
# Set this to false to not have the formula install packages (in the case you
|
# Set this to false to not have the formula install packages (in the case you
|
||||||
|
|
|
@ -25,9 +25,8 @@
|
||||||
|
|
||||||
|
|
||||||
Debian:
|
Debian:
|
||||||
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
|
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'
|
||||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
|
||||||
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
|
|
||||||
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
|
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
|
||||||
libgit2: libgit2-22
|
libgit2: libgit2-22
|
||||||
pyinotify: python-pyinotify
|
pyinotify: python-pyinotify
|
||||||
|
|
|
@ -38,8 +38,8 @@ Ubuntu:
|
||||||
install_from_package: Null
|
install_from_package: Null
|
||||||
|
|
||||||
Raspbian:
|
Raspbian:
|
||||||
pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
|
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'
|
||||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring.gpg'
|
||||||
|
|
||||||
SmartOS:
|
SmartOS:
|
||||||
salt_master: salt
|
salt_master: salt
|
||||||
|
|
|
@ -21,7 +21,9 @@ salt-pkgrepo-install-saltstack-debian:
|
||||||
- humanname: SaltStack Debian Repo
|
- humanname: SaltStack Debian Repo
|
||||||
- name: {{ salt_settings.pkgrepo }}
|
- name: {{ salt_settings.pkgrepo }}
|
||||||
- file: /etc/apt/sources.list.d/salt.list
|
- file: /etc/apt/sources.list.d/salt.list
|
||||||
|
{% if salt_settings.get('key_url') is not none %}
|
||||||
- key_url: {{ salt_settings.key_url }}
|
- key_url: {{ salt_settings.key_url }}
|
||||||
|
{% endif %}
|
||||||
- clean_file: True
|
- clean_file: True
|
||||||
# Order: 3 because we can't put a require_in on "pkg: salt-{master,minion}"
|
# Order: 3 because we can't put a require_in on "pkg: salt-{master,minion}"
|
||||||
# because we don't know if they are used.
|
# because we don't know if they are used.
|
||||||
|
|
|
@ -42,7 +42,6 @@ values:
|
||||||
version: 0.23.0
|
version: 0.23.0
|
||||||
version: 0.22.1
|
version: 0.22.1
|
||||||
install_packages: true
|
install_packages: true
|
||||||
key_url: https://repo.saltproject.io/py3/debian/10/amd64/3001/SALTSTACK-GPG-KEY.pub
|
|
||||||
libgit2: libgit2-22
|
libgit2: libgit2-22
|
||||||
master:
|
master:
|
||||||
ext_pillar:
|
ext_pillar:
|
||||||
|
|
|
@ -42,7 +42,6 @@ values:
|
||||||
version: 0.23.0
|
version: 0.23.0
|
||||||
version: 0.22.1
|
version: 0.22.1
|
||||||
install_packages: true
|
install_packages: true
|
||||||
key_url: https://repo.saltproject.io/py3/debian/9/amd64/3001/SALTSTACK-GPG-KEY.pub
|
|
||||||
libgit2: libgit2-22
|
libgit2: libgit2-22
|
||||||
master:
|
master:
|
||||||
ext_pillar:
|
ext_pillar:
|
||||||
|
|
|
@ -42,7 +42,6 @@ values:
|
||||||
version: 0.23.0
|
version: 0.23.0
|
||||||
version: 0.22.1
|
version: 0.22.1
|
||||||
install_packages: true
|
install_packages: true
|
||||||
key_url: https://repo.saltproject.io/py3/debian/10/amd64/3002/SALTSTACK-GPG-KEY.pub
|
|
||||||
libgit2: libgit2-22
|
libgit2: libgit2-22
|
||||||
master:
|
master:
|
||||||
ext_pillar:
|
ext_pillar:
|
||||||
|
|
|
@ -42,7 +42,6 @@ values:
|
||||||
version: 0.23.0
|
version: 0.23.0
|
||||||
version: 0.22.1
|
version: 0.22.1
|
||||||
install_packages: true
|
install_packages: true
|
||||||
key_url: https://repo.saltproject.io/py3/debian/9/amd64/3002/SALTSTACK-GPG-KEY.pub
|
|
||||||
libgit2: libgit2-22
|
libgit2: libgit2-22
|
||||||
master:
|
master:
|
||||||
ext_pillar:
|
ext_pillar:
|
||||||
|
|
Loading…
Reference in New Issue