saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #449 from noelmcloughlin/hardcoding2

Browse Source 
feat(mapping): simplify py version handling, less jinja
This commit is contained in:
N 2020-01-26 00:41:05 +01:00 committed by GitHub
commit 7fdbb84b4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/defaults.yaml
View File

@ -3,6 +3,7 @@
---
salt:
version: ''
py_ver: '' ## py2 is default
rootuser: root
rootgroup: root
install_packages: true

30
salt/osfamilymap.yaml
View File

@ -2,9 +2,7 @@
# vim: ft=yaml
---
{%- import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
{%- set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
{%- set py_ver_repr = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set osrelease = salt['grains.get']('osrelease') %}
{#- Workaround for OpenSuse Leap 15.1 until the repo is available #}
@ -26,8 +24,8 @@
{%- endif %}
Debian:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
libgit2: libgit2-22
pyinotify: python-pyinotify
gitfs:
@ -43,8 +41,8 @@ Debian:
RedHat:
pkgrepo_name: saltstack
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo: 'https://repo.saltstack.com/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2
python_git: GitPython
gitfs:
@ -105,14 +103,14 @@ Alpine:
FreeBSD:
rootgroup: wheel
salt_master: py27-salt
salt_minion: py27-salt
salt_syndic: py27-salt
salt_cloud: py27-salt
salt_api: py27-salt
salt_ssh: py27-salt
python_git: py27-GitPython
pygit2: py27-pygit2
salt_master: {{ py_ver_repr or 'py27' }}-salt
salt_minion: {{ py_ver_repr or 'py27' }}-salt
salt_syndic: {{ py_ver_repr or 'py27' }}-salt
salt_cloud: {{ py_ver_repr or 'py27' }}-salt
salt_api: {{ py_ver_repr or 'py27' }}-salt
salt_ssh: {{ py_ver_repr or 'py27' }}-salt
python_git: {{ py_ver_repr or 'py27' }}-GitPython
pygit2: {{ py_ver_repr or 'py27' }}-pygit2
config_path: /usr/local/etc/salt
minion_service: salt_minion
master_service: salt_master
@ -132,7 +130,7 @@ OpenBSD:
python_git: py-GitPython
Windows:
salt_minion: salt-minion{{ py_ver_repr }}
salt_minion: salt-minion{{ py_ver_repr or '-py3' }}
config_path: 'C:\salt\conf'
minion_service: salt-minion

18
salt/osmap.yaml
View File

@ -2,9 +2,7 @@
# vim: ft=yaml
---
{% import_yaml "salt/ospyvermap.yaml" as ospyvermap %}
{% set ospyver = salt['grains.filter_by'](ospyvermap, grain='os_family') or {} %}
{% set py_ver_dir = salt['pillar.filter_by'](ospyver, pillar='salt:py_ver', default='py2') %}
{%- set py_ver_dir = salt['pillar.get']('salt:py_ver', '') %}
{% set osrelease = salt['grains.get']('osrelease') %}
{% set salt_release = salt['pillar.get']('salt:release', 'latest') %}
@ -22,12 +20,12 @@ Fedora:
Amazon:
pkgrepo_name: saltstack-amzn-repo
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
pkgrepo: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/yum/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo: 'https://repo.saltstack.com/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
Ubuntu:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pygit2: python-pygit2
gitfs:
pygit2:
@ -37,8 +35,8 @@ Ubuntu:
install_from_package: Null
Raspbian:
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
pkgrepo: 'deb http://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
key_url: 'https://repo.saltstack.com/{{ py_ver_dir or 'apt' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
SmartOS:
salt_master: salt
@ -50,7 +48,7 @@ SmartOS:
minion_service: 'salt:minion'
master_service: 'salt:master'
api_service: 'salt:api'
python_dulwich: 'py27-dulwich'
python_dulwich: {{ py_ver_dir or 'py27' }}{{ '-dulwich' }}
gitfs:
dulwich:
install_from_source: false

34
salt/ospyvermap.yaml
View File

@ -1,34 +0,0 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
Debian:
py2: 'apt'
py3: 'py3'
RedHat:
py2: 'yum'
py3: 'py3'
Suse: {}
Gentoo: {}
Arch: {}
Alpine: {}
FreeBSD: {}
OpenBSD: {}
# This is *not* used directly with https://repo.saltstack.com
# Rather, this is used with `salt-winrepo-ng`, where the package names are:
# * py2: salt-minion
# * py3: salt-minion-py3
Windows:
py2: ''
py3: '-py3'
MacOS:
py2: 'py2'
py3: 'py3'

1
test/salt/pillar/v201707-py2.sls
View File

@ -3,4 +3,3 @@
---
salt:
release: '2017.7'
py_ver: 'py2'

1
test/salt/pillar/v201803-py2.sls
View File

@ -3,4 +3,3 @@
---
salt:
release: '2018.3'
py_ver: 'py2'

1
test/salt/pillar/v201902-py2.sls
View File

@ -3,4 +3,3 @@
---
salt:
release: '2019.2'
py_ver: 'py2'