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

Fixed merging dicts in map.jinja

Browse Source
This commit is contained in:
Gregory Ballantine 2018-03-31 23:47:40 -04:00
parent 7049998115
commit 5d7c995a03
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
munin/map.jinja
View File

@ -18,7 +18,7 @@
'config': '/usr/local/etc/munin/munin.conf', 'config': '/usr/local/etc/munin/munin.conf',
'file_group': 'wheel', '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']({ {% set munin_node_osmap = salt['grains.filter_by']({
'Arch': { 'Arch': {
@ -34,7 +34,7 @@
'plugin_target_dir': '/usr/local/share/munin/plugins', 'plugin_target_dir': '/usr/local/share/munin/plugins',
'file_group': 'wheel', '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']({ {% set net_ssleay_osmap = salt['grains.filter_by']({
'Debian': { 'Debian': {
@ -46,7 +46,7 @@
'Gentoo': { 'Gentoo': {
'package': 'dev-perl/Net-SSLeay', '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']({ {% set munin_tls_osmap = salt['grains.filter_by']({
'FreeBSD': { 'FreeBSD': {
@ -54,7 +54,7 @@
'certificate': '/usr/local/etc/munin/tls/crt.pem', 'certificate': '/usr/local/etc/munin/tls/crt.pem',
'ca_certificate': '/usr/local/etc/munin/tls/cacert.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 ##} {## Merge osmaps into defaults, then marge in pillar ##}
{% set munin_master = default_settings.munin_master.update(munin_master_osmap) %} {% set munin_master = default_settings.munin_master.update(munin_master_osmap) %}