| commit | 80de28075513c532e48cac1cc7e52098accacf5e | [log] [tgz] |
|---|---|---|
| author | Éric Lemoine <elemoine@mirantis.com> | Fri Nov 04 14:53:45 2016 +0000 |
| committer | Éric Lemoine <elemoine@mirantis.com> | Mon Nov 07 16:29:34 2016 +0000 |
| tree | 7e604df258ed0daf9b041234012681754949cd48 | |
| parent | 68b17b6ec9999f8ca11816299b978fa2356da741 [diff] |
Use filter_by to merge node grains data
diff --git a/heka/_service.sls b/heka/_service.sls index 0d19744..e873f2e 100644 --- a/heka/_service.sls +++ b/heka/_service.sls
@@ -147,7 +147,7 @@ {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %} {%- if node_grains.heka is defined %} -{%- do service_grains.update(node_grains.heka) %} +{%- set service_grains = salt['grains.filter_by']({'default': service_grains}, merge=node_grains.heka) %} {%- endif %} {%- endfor %}