From 5d7c995a031c39c1d925c70ec3d0fea743a128ae Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine555@gmail.com>
Date: Sat, 31 Mar 2018 23:47:40 -0400
Subject: [PATCH] Fixed merging dicts in map.jinja

---
 munin/map.jinja | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/munin/map.jinja b/munin/map.jinja
index 2ea61df..3233c7b 100644
--- a/munin/map.jinja
+++ b/munin/map.jinja
@@ -18,7 +18,7 @@
         'config': '/usr/local/etc/munin/munin.conf',
         'file_group': 'wheel',
     },
-}, grain='os_family', salt['pillar.get']('munin:lookup:munin_master')) %}
+}, grain='os_family', merge=salt['pillar.get']('munin:lookup:munin_master')) %}
 
 {% set munin_node_osmap = salt['grains.filter_by']({
     'Arch': {
@@ -34,7 +34,7 @@
         'plugin_target_dir': '/usr/local/share/munin/plugins',
         'file_group': 'wheel',
     },
-}, grain='os_family', salt['pillar.get']('munin:lookup:munin_node')) %}
+}, grain='os_family', merge=salt['pillar.get']('munin:lookup:munin_node')) %}
 
 {% set net_ssleay_osmap = salt['grains.filter_by']({
     'Debian': {
@@ -46,7 +46,7 @@
     'Gentoo': {
         'package': 'dev-perl/Net-SSLeay',
     },
-}, grain='os_family', salt['pillar.get']('munin:lookup:net_ssleay')) %}
+}, grain='os_family', merge=salt['pillar.get']('munin:lookup:net_ssleay')) %}
 
 {% set munin_tls_osmap = salt['grains.filter_by']({
     'FreeBSD': {
@@ -54,7 +54,7 @@
         'certificate': '/usr/local/etc/munin/tls/crt.pem',
         'ca_certificate': '/usr/local/etc/munin/tls/cacert.pem',
     },
-}, grain='os_family', salt['pillar.get']('munin:lookup:munin_tls')) %}
+}, grain='os_family', merge=salt['pillar.get']('munin:lookup:munin_tls')) %}
 
 {## Merge osmaps into defaults, then marge in pillar ##}
 {% set munin_master = default_settings.munin_master.update(munin_master_osmap) %}