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

Changed name of default_settings variable to defaults

Browse Source
This commit is contained in:
Gregory Ballantine 2018-04-01 00:05:29 -04:00
parent bc3e34f409
commit c81dec7460
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

@ -2,11 +2,11 @@
# vim: ft=jinja # vim: ft=jinja
{## Start with default values from defaults.yaml ##} {## Start with default values from defaults.yaml ##}
{% import_yaml 'munin/defaults.yaml' as default_settings %} {% import_yaml 'munin/defaults.yaml' as defaults %}
{## Set OS-specific values for each of the states ##} {## Set OS-specific values for each of the states ##}
{% set munin_master_osmap = salt['grains.filter_by']( {% set munin_master_osmap = salt['grains.filter_by'](
default_settings.munin_master, defaults.munin_master,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']({ merge=salt['grains.filter_by']({
'Arch': { 'Arch': {
@ -25,7 +25,7 @@
) %} ) %}
{% set munin_node_osmap = salt['grains.filter_by']( {% set munin_node_osmap = salt['grains.filter_by'](
default_settings.munin_node, defaults.munin_node,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']({ merge=salt['grains.filter_by']({
'Arch': { 'Arch': {
@ -45,7 +45,7 @@
) %} ) %}
{% set net_ssleay_osmap = salt['grains.filter_by']( {% set net_ssleay_osmap = salt['grains.filter_by'](
default_settings.net_ssleay, defaults.net_ssleay,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']({ merge=salt['grains.filter_by']({
'Debian': { 'Debian': {
@ -61,7 +61,7 @@
) %} ) %}
{% set munin_tls_osmap = salt['grains.filter_by']( {% set munin_tls_osmap = salt['grains.filter_by'](
default_settings.munin_tls, defaults.munin_tls,
grain='os_family', grain='os_family',
merge=salt['grains.filter_by']({ merge=salt['grains.filter_by']({
'FreeBSD': { 'FreeBSD': {