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

Merge pull request #15 from sys4/master

Browse Source 
munin/map.jinja: move lookup data to munin:. namespace
This commit is contained in:
puneet kandhari 2015-12-02 16:25:24 -06:00
commit 8a819737a6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
munin/map.jinja
View File

@ -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')) %}

10
pillar.example
View File

@ -1,3 +1,13 @@
# Only enable and change or add lookup data when you need to change the defaults!
#munin:
# lookup:
# master:
# config_src: 'salt://munin/files/my-munin.conf',
# node:
# config_src: 'salt://munin/files/my-munin-node.conf',
# tls:
# private_key: '/etc/ssl/private/munin/key.pem'
munin_master: munin_master:
globals: globals:
dbdir: "/var/lib/munin" dbdir: "/var/lib/munin"