Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-06 23:16:54 +02:00
Code Issues Activity

Merge branch 'master' into macos

Browse Source
This commit is contained in:
N committed 2020-06-01 01:08:54 +01:00
2 parents efc5d7c632 4955737f84
commit 4d901b94d1
22 files changed
+103 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/cloud.sls
+2 -1
View File
@@ -1,3 +1,4 @@
{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
{%- if salt_settings.use_pip %}
@@ -34,7 +35,7 @@ salt-cloud:
cloud-cert-{{ cert }}-pem:
file.managed:
- name: {{ salt_settings.config_path }}/pki/cloud/{{ cert }}.pem
- source: salt://{{ slspath }}/files/key
- source: salt://{{ tplroot }}/files/key
- template: jinja
- user: root
- group:
salt/defaults.yaml
+1
View File
@@ -3,6 +3,7 @@
---
salt:
version: ''
py_ver: '' ## py2 is default
rootuser: root
rootgroup: root
install_packages: true
salt/libtofs.jinja
+2 -2
View File
@@ -16,7 +16,7 @@
'<tplroot>:tofs:files_switch' this is the ordered list of grains to
use as selector switch of the directories under
"<path_prefix>/files"
* indent_witdh: indentation of the result value to conform to YAML
* indent_width: indentation of the result value to conform to YAML
* use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot`
@@ -82,7 +82,7 @@
) %}
{#- Append an empty value to evaluate as `default` in the loop below #}
{%- if '' not in fsl %}
{%- do fsl.append('') %}
{%- set fsl = fsl + [''] %}
{%- endif %}
{%- for fs in fsl %}
{%- for src_file in src_files %}
salt/master.sls
+1 -1
View File
@@ -45,7 +45,7 @@ salt-master:
}}
{%- else %}
- template: jinja
- source: salt://{{ slspath }}/files/master.d
- source: salt://{{ tplroot }}/files/master.d
{%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
salt/minion.sls
+1 -1
View File
@@ -92,7 +92,7 @@ salt-minion:
}}
{%- else %}
- template: jinja
- source: salt://{{ slspath }}/files/minion.d
- source: salt://{{ tplroot }}/files/minion.d
- context:
standalone: False
{%- endif %}
salt/osfamilymap.yaml
+14 -16
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
salt/osmap.yaml
+8 -10
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
salt/ospyvermap.yaml
-34
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'
salt/ssh.sls
+2 -1
View File
@@ -1,3 +1,4 @@
{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
{% if salt_settings.install_packages %}
@@ -12,7 +13,7 @@ ensure-salt-ssh-is-installed:
ensure-roster-config:
file.managed:
- name: {{ salt_settings.config_path }}/roster
- source: salt://{{ slspath }}/files/roster.jinja
- source: salt://{{ tplroot }}/files/roster.jinja
- template: jinja
{% if salt_settings.install_packages %}
- require:
salt/standalone.sls
+2 -1
View File
@@ -1,3 +1,4 @@
{%- set tplroot = tpldir.split('/')[0] %}
{% from "salt/map.jinja" import salt_settings with context %}
salt-minion:
@@ -11,7 +12,7 @@ salt-minion:
file.recurse:
- name: {{ salt_settings.config_path }}/minion.d
- template: jinja
- source: salt://{{ slspath }}/files/minion.d
- source: salt://{{ tplroot }}/files/minion.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- context: