Browse Source

Merge pull request #139 from willshersystems/centos

Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
master
puneet kandhari 9 years ago
parent
commit
8d8371f19d
6 changed files with 32 additions and 7 deletions
  1. +3
    -0
      README.rst
  2. +2
    -3
      salt/gitfs/pygit2.sls
  3. +12
    -1
      salt/map.jinja
  4. +5
    -3
      salt/pkgrepo/init.sls
  5. +0
    -0
      salt/pkgrepo/redhat/absent.sls
  6. +10
    -0
      salt/pkgrepo/redhat/init.sls

+ 3
- 0
README.rst View File

---------------------- ----------------------


Install gitfs backend libgit2/pygit2 dependenciess. Set ``salt:master:gitfs_provider: pygit2`` in your pillar. Install gitfs backend libgit2/pygit2 dependenciess. Set ``salt:master:gitfs_provider: pygit2`` in your pillar.
For EL distributions, pygit is installed from packages from `EPEL <https://github.com/saltstack-formulas/epel-formula>`_.


``salt.pkgrepo`` ``salt.pkgrepo``
---------------- ----------------
official documentation official documentation
<http://docs.saltstack.com/en/latest/topics/installation/index.html#platform-specific-installation-instructions>`_. <http://docs.saltstack.com/en/latest/topics/installation/index.html#platform-specific-installation-instructions>`_.


On EL distributions, the official Salt `COPR for ZeroMQ 4 <http://copr.fedoraproject.org/coprs/saltstack/zeromq4/>`_. Salt itself is installed via `EPEL <https://github.com/saltstack-formulas/epel-formula>`_.

``salt.pkgrepo.absent`` ``salt.pkgrepo.absent``
----------------------- -----------------------



+ 2
- 3
salt/gitfs/pygit2.sls View File

- name: pygit2 - name: pygit2


{% else %} {% 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 %} {% endif %}

+ 12
- 1
salt/map.jinja View File

'CentOS': {}, 'CentOS': {},
'Amazon': {}, 'Amazon': {},
'Fedora': {}, 'Fedora': {},
'RedHat': {},
'RedHat': {
'pygit2': 'python-pygit2',
'gitfs': {
'pygit2': {
'install_from_source': False
},
},
'master': {
'gitfs_provider': 'pygit2'
},
'repotype': 'epel'
},
'Suse': {}, 'Suse': {},
'Gentoo': { 'Gentoo': {
'salt_master': 'app-admin/salt', 'salt_master': 'app-admin/salt',

+ 5
- 3
salt/pkgrepo/init.sls View File

{% if grains['os_family'] == 'Debian' %}
{% set name = {
'RedHat': 'redhat',
'Debian': grains['os']|lower,
}.get(grains.os_family) %}
include: include:
- .{{ grains['os']|lower }}
{% endif %}
- .{{ name }}

+ 0
- 0
salt/pkgrepo/redhat/absent.sls View File


+ 10
- 0
salt/pkgrepo/redhat/init.sls View File

{% 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

Loading…
Cancel
Save