munin/map.jinja: move lookup data to munin:. namespace
lookupup data has been in same namespace as the config data which caused lokkup data ended up in the munin config files To not clutter templates with ugly "if not lookup" statements lookup data has been moved to a global "munin:" pillar namespace
This commit is contained in:
parent
e9da468f8d
commit
bd5a2669a5
@ -16,7 +16,7 @@
|
|||||||
'cron_service': '/etc/systemd/system/munin-cron.service',
|
'cron_service': '/etc/systemd/system/munin-cron.service',
|
||||||
'cron_timer': '/etc/systemd/system/munin-cron.timer',
|
'cron_timer': '/etc/systemd/system/munin-cron.timer',
|
||||||
},
|
},
|
||||||
}, merge=salt['pillar.get']('munin_master:lookup')) %}
|
}, merge=salt['pillar.get']('munin:lookup:master')) %}
|
||||||
|
|
||||||
{% set munin_node = salt['grains.filter_by']({
|
{% set munin_node = salt['grains.filter_by']({
|
||||||
'Debian': {
|
'Debian': {
|
||||||
@ -40,7 +40,7 @@
|
|||||||
'config_src': 'salt://munin/files/munin-node.conf',
|
'config_src': 'salt://munin/files/munin-node.conf',
|
||||||
'plugin_dir': '/usr/lib/munin/plugins',
|
'plugin_dir': '/usr/lib/munin/plugins',
|
||||||
},
|
},
|
||||||
}, merge=salt['pillar.get']('munin_node:lookup')) %}
|
}, merge=salt['pillar.get']('munin:lookup:node')) %}
|
||||||
|
|
||||||
{% set net_ssleay = salt['grains.filter_by']({
|
{% set net_ssleay = salt['grains.filter_by']({
|
||||||
'Debian': {
|
'Debian': {
|
||||||
@ -62,4 +62,4 @@
|
|||||||
'certificate': '/etc/munin/tls/crt.pem',
|
'certificate': '/etc/munin/tls/crt.pem',
|
||||||
'ca_certificate': '/etc/munin/tls/cacert.pem',
|
'ca_certificate': '/etc/munin/tls/cacert.pem',
|
||||||
},
|
},
|
||||||
}, merge=salt['pillar.get']('munin_tls:lookup')) %}
|
}, merge=salt['pillar.get']('munin:lookup:tls')) %}
|
||||||
|
Loading…
Reference in New Issue
Block a user