From bc3e34f4090249f10fa3db1a9b31db3950f43df9 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Sun, 1 Apr 2018 00:03:22 -0400 Subject: [PATCH] Fixed merging again --- munin/map.jinja | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/munin/map.jinja b/munin/map.jinja index a3a8432..8593a79 100644 --- a/munin/map.jinja +++ b/munin/map.jinja @@ -60,7 +60,7 @@ }, grain='os_family'), ) %} -{% set munin_tls_osmap = salt['grains.filter_by']({ +{% set munin_tls_osmap = salt['grains.filter_by']( default_settings.munin_tls, grain='os_family', merge=salt['grains.filter_by']({ @@ -73,7 +73,7 @@ ) %} {## Merge default values with pillar values ##} -{% set munin_master = munin_master_osmap.update(salt['pillar.get']('munin:lookup:munin_master')) %} -{% set munin_node = munin_node_osmap.update(salt['pillar.get']('munin:lookup:munin_node')) %} -{% set net_ssleay = net_ssleay_osmap.update(salt['pillar.get']('munin:lookup:net_ssleay')) %} -{% set munin_tls = munin_tls_osmap.update(salt['pillar.get']('munin:lookup:munin_tls')) %} +{% set munin_master = munin_master_osmap.update(salt['pillar.get']('munin:lookup:munin_master', {})) %} +{% set munin_node = munin_node_osmap.update(salt['pillar.get']('munin:lookup:munin_node', {})) %} +{% set net_ssleay = net_ssleay_osmap.update(salt['pillar.get']('munin:lookup:net_ssleay', {})) %} +{% set munin_tls = munin_tls_osmap.update(salt['pillar.get']('munin:lookup:munin_tls', {})) %}