b03831c0b0
This change tweaks the GitPython package installation state to support alternate package names (on FreeBSD, it's called "py27-GitPython"). Also, on FreeBSD salt-ssh is included in the "py27-salt" package by default, requiring an update to `distro_map`.
74 lines
1.9 KiB
Django/Jinja
74 lines
1.9 KiB
Django/Jinja
# -*- coding: utf-8 -*-
|
|
# vim: ft=jinja
|
|
|
|
{## Start with defaults from defaults.yaml ##}
|
|
{% import_yaml "salt/defaults.yaml" as default_settings %}
|
|
|
|
{##
|
|
Setup variable using grains['os_family'] based logic, only add key:values here
|
|
that differ from whats in defaults.yaml
|
|
##}
|
|
{% set os_family_map = salt['grains.filter_by']({
|
|
'Debian': {},
|
|
'Ubuntu': {},
|
|
'CentOS': {},
|
|
'Amazon': {},
|
|
'Fedora': {},
|
|
'RedHat': {
|
|
'pygit2': 'python-pygit2',
|
|
'gitfs': {
|
|
'pygit2': {
|
|
'install_from_source': False
|
|
},
|
|
},
|
|
'master': {
|
|
'gitfs_provider': 'pygit2'
|
|
},
|
|
'repotype': 'epel'
|
|
},
|
|
'Suse': {},
|
|
'Gentoo': {
|
|
'salt_master': 'app-admin/salt',
|
|
'salt_minion': 'app-admin/salt',
|
|
'salt_syndic': 'app-admin/salt',
|
|
'salt_api': 'app-admin/salt',
|
|
'salt_cloud': 'app-admin/salt'
|
|
},
|
|
'Arch': {
|
|
'salt_master': 'salt-zmq',
|
|
'salt_minion': 'salt-zmq',
|
|
'salt_syndic': 'salt-zmq',
|
|
'salt_cloud': 'salt-zmq',
|
|
'salt_api': 'salt-zmq',
|
|
'salt_ssh': 'salt-zmq'
|
|
},
|
|
'FreeBSD': {
|
|
'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',
|
|
'config_path': '/usr/local/etc/salt',
|
|
'minion_service': 'salt_minion',
|
|
'master_service': 'salt_master',
|
|
'api_service': 'salt_api',
|
|
'syndic_service': 'salt_syndic'
|
|
},
|
|
}
|
|
, grain="os_family"
|
|
, merge=salt['pillar.get']('salt:lookup'))
|
|
%}
|
|
|
|
{## Merge the flavor_map to the default settings ##}
|
|
{% do default_settings.salt.update(os_family_map) %}
|
|
|
|
{## Merge in salt:lookup pillar ##}
|
|
{% set salt_settings = salt['pillar.get'](
|
|
'salt',
|
|
default=default_settings.salt,
|
|
merge=True
|
|
)
|
|
%}
|