Fix deep merge of settings

7 years ago · 0ac29dd03f
parent 3676ff6216
commit 0ac29dd03f
1 changed files with 4 additions and 6 deletions
--- a/logrotate/map.jinja
+++ b/logrotate/map.jinja
@ -40,11 +40,9 @@
    merge=os_family_map) or {}
 %}

-{% do default_settings.logrotate.update(os_map) %}
-
-{% set logrotate = salt['pillar.get'](
-        'logrotate',
-        default=default_settings.logrotate,
-        merge=True
+{% set logrotate = salt['grains.filter_by'](
+        default_settings,
+        merge=os_map,
+        base='logrotate',
    )
 %}