Merge pull request #2 from saltstack-formulas/master

Merge upstream changes

README.rst

@@ -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
-benefit from the latest version. This state currently only works on Debian
-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>`_.
+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>`_.
 
 ``salt.pkgrepo.absent``
 -----------------------

salt/files/master.d/f_defaults.conf

@@ -1045,3 +1045,12 @@ rest_tornado:
 ##########################################
 {{ get_config('presence_events', 'False') }}
 {% endif %}
+
+{% if 'consul_config' in cfg_master %}
+#####         consul_config          #####
+##########################################
+consul_config:
+  {% for name, value in cfg_master['consul_config'].items() %}
+  {{ name }}: {{ value }}
+  {%- endfor %}
+{%- endif %}

salt/pkgrepo/redhat/init.sls

@@ -1,10 +1,9 @@
 {% from "salt/map.jinja" import salt_settings with context %}
 
-saltstack-zeromq4:
+saltstack-pkgrepo:
   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
+    - humanname: SaltStack repo for RHEL/CentOS $releasever
+    - baseurl: https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest
     - enabled: 1
+    - gpgcheck: 1
+    - gpgkey: https://repo.saltstack.com/yum/redhat/$releasever/$basearch/latest/SALTSTACK-GPG-KEY.pub