Salt-Formulas/munin-formula
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed merging again

Browse Source
This commit is contained in:
Gregory Ballantine 2018-04-01 00:03:22 -04:00
parent cfbdfbaae8
commit bc3e34f409
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
munin/map.jinja
View File

@ -60,7 +60,7 @@
}, grain='os_family'), }, grain='os_family'),
) %} ) %}
{% set munin_tls_osmap = salt['grains.filter_by']({ {% set munin_tls_osmap = salt['grains.filter_by'](
default_settings.munin_tls, default_settings.munin_tls,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']({ merge=salt['grains.filter_by']({
@ -73,7 +73,7 @@
) %} ) %}
{## Merge default values with pillar values ##} {## Merge default values with pillar values ##}
{% set munin_master = munin_master_osmap.update(salt['pillar.get']('munin:lookup:munin_master')) %} {% 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 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 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_tls = munin_tls_osmap.update(salt['pillar.get']('munin:lookup:munin_tls', {})) %}