Improvements to Enterprise Linux family OSs.

* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository

Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
This commit is contained in:
Matt Willsher committed 2015-06-04 17:35:40 +01:00
1 parent bffb87c29f
commit e2d192ba89
6 files changed
+32 -7

No files matched your search

+2 -3
View File
@@ -53,8 +53,7 @@ install-pygit2:
- name: pygit2
{% else %}
# install from package
# TODO haven't actually found a distro that has a good version to test
# debian jessie will have libgit2-21
{{ salt_settings.pygit2 }}:
pkg.installed
{% endif %}
+12 -1
View File
@@ -14,7 +14,18 @@ that differ from whats in defaults.yaml
'CentOS': {},
'Amazon': {},
'Fedora': {},
'RedHat': {},
'RedHat': {
'pygit2': 'python-pygit2',
'gitfs': {
'pygit2': {
'install_from_source': False
},
},
'master': {
'gitfs_provider': 'pygit2'
},
'repotype': 'epel'
},
'Suse': {},
'Gentoo': {
'salt_master': 'app-admin/salt',
+5 -3
View File
@@ -1,4 +1,6 @@
{% if grains['os_family'] == 'Debian' %}
{% set name = {
'RedHat': 'redhat',
'Debian': grains['os']|lower,
}.get(grains.os_family) %}
include:
- .{{ grains['os']|lower }}
{% endif %}
- .{{ name }}
View File
Whitespace-only changes.
+10
View File
@@ -0,0 +1,10 @@
{% from "salt/map.jinja" import salt_settings with context %}
saltstack-zeromq4:
pkgrepo.managed:
- humanname: Copr repo for zeromq4 owned by saltstack
- baseurl: http://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/{{ salt_settings.repotype }}-$releasever-$basearch/
- gpgcheck: 1
- gpgkey: https://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/pubkey.gpg
- skip_if_unavailable: True
- enabled: 1