From 0ac29dd03fcf717d42becd398f922cf060b7c1b4 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
Date: Tue, 14 Feb 2017 17:03:08 +0100
Subject: [PATCH] Fix deep merge of settings

---
 logrotate/map.jinja | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/logrotate/map.jinja b/logrotate/map.jinja
index b3f6897..791522d 100644
--- 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',
     )
 %}