Merge pull request #63 from txomon/fix/arch-master-config

Fix/arch master config

salt/files/master.conf

@@ -141,6 +141,7 @@ master_tops:
   {%- endif %}
 {%- endif %}
 
+{%- if pillar.salt.get('minion') %}
 {%- for handler in pillar.salt.minion.get("handlers", []) %}
 {%- if handler.engine == "udp"%}
 
@@ -156,6 +157,7 @@ logstash_zmq_handler:
   version: 1
 {%- endif %}
 {%- endfor %}
+{%- endif %}
 
 {%- if master.get('order_masters', False) %}
 

salt/map.jinja

@@ -28,7 +28,7 @@ default:
 {%- load_yaml as master_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-master
@@ -91,7 +91,7 @@ default:
 {%- load_yaml as minion_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-minion