| commit | 8cf20446248f656dfe076b30f10cb80c503ea88d | [log] [tgz] |
|---|---|---|
| author | Dmitry Kalashnik <dkalashnik@mirantis.com> | Wed Nov 22 16:47:47 2017 +0400 |
| committer | Dmitry Kalashnik <dkalashnik@mirantis.com> | Wed Nov 22 16:47:47 2017 +0400 |
| tree | ade06d34fc43801cb852acab0fc9cd3618ba6d45 | |
| parent | 60f33ce3a440cf8422c6e4c91e59e33bd6b4454b [diff] |
Fix meta grains merging Change-Id: I9c9cdefb9ccfde3ee52c11ac2bf21c946f1e8e47
diff --git a/fluentd/map.jinja b/fluentd/map.jinja index 1ced2a0..95bcd72 100644 --- a/fluentd/map.jinja +++ b/fluentd/map.jinja
@@ -29,4 +29,4 @@ {%- endfor %} {# Deep-merge the service configuration with the pillar data #} -{%- do salt['defaults.merge'](fluentd_agent, fluentd_grains) %} +{%- do salt['defaults.merge'](fluentd_agent, fluentd_grains.get('agent', {})) %}