2
0

Merge pull request #196 from iamseth/master

Replace pkgrepo with offical Saltstack repo
This commit is contained in:
Forrest 2016-01-17 20:07:50 -08:00
commit 0fee3f58f2
2 changed files with 6 additions and 12 deletions

View File

@ -73,12 +73,7 @@ For EL distributions, pygit is installed from packages from `EPEL <https://githu
---------------- ----------------
Enable the official saltstack package repository in order to always Enable the official saltstack package repository in order to always
benefit from the latest version. This state currently only works on Debian benefit from the latest version. This state currently only works on Debian, Ubuntu, RHEL 6/7 and aims to implement the `installation recommendations of the official documentation <http://docs.saltstack.com/en/latest/topics/installation/index.html#platform-specific-installation-instructions>`_.
and Ubuntu, and aims to implement the `installation recommendations of the
official documentation
<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``
----------------------- -----------------------

View File

@ -1,10 +1,9 @@
{% from "salt/map.jinja" import salt_settings with context %} {% from "salt/map.jinja" import salt_settings with context %}
saltstack-zeromq4: saltstack-pkgrepo:
pkgrepo.managed: pkgrepo.managed:
- humanname: Copr repo for zeromq4 owned by saltstack - humanname: SaltStack repo for RHEL/CentOS $releasever
- baseurl: http://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/{{ salt_settings.repotype }}-$releasever-$basearch/ - baseurl: https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest
- gpgcheck: 1
- gpgkey: https://copr-be.cloud.fedoraproject.org/results/saltstack/zeromq4/pubkey.gpg
- skip_if_unavailable: True
- enabled: 1 - enabled: 1
- gpgcheck: 1
- gpgkey: https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest/SALTSTACK-GPG-KEY.pub