commit 503c5af6b3d4d0bce215c6899fd050f4beddb875
author Ales Komarek <ales.komarek@tcpcloud.eu> Wed Oct 19 15:51:33 2016 +0200
committer Ales Komarek <ales.komarek@tcpcloud.eu> Wed Oct 19 15:51:33 2016 +0200
tree d4ae0ab189e52375e4e983987f4956a6424dfb9f
parent 8564b58f2fe480b1a747bdd77c48632671098183

Reverse merge dicts

collectd/client.sls

diff --git a/collectd/client.sls b/collectd/client.sls
index 1285dc1..a5b2128 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -65,7 +65,7 @@
 {%- set grains_yaml = load_grains_file()|load_yaml %}
 
 {%- if grains_yaml is mapping %}
-{%- set service_grains = salt['grains.filter_by']({'default': {'collectd': service_grains}}, merge=grains_yaml) %}
+{%- set service_grains = salt['grains.filter_by']({'default': service_grains}, merge={'collectd': grains_yaml}) %}
 {%- endif %}
 
 {%- endif %}