Merge branch 'master' of /git/ansible

playbooks/groups/proxies.yml

@@ -34,6 +34,7 @@
   - fas_client
   - collectd/base
   - sudo
+  - rsyncd
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"

roles/fedmsg/base/templates/base.py.j2

@@ -63,6 +63,12 @@ config = dict(
     zmq_tcp_keepalive_cnt=3,
     zmq_tcp_keepalive_idle=60,
     zmq_tcp_keepalive_intvl=5,
+
+    # See the following
+    #   - https://github.com/fedora-infra/fedmsg/issues/305
+    #   - http://api.zeromq.org/3-2:zmq-setsockopt
+    zmq_reconnect_ivl=100,
+    zmq_reconnect_ivl_max=1000,
 )
 
 # This option adds an IPC socket by which we can monitor hub health.