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

Fixed some variable names in map.jinja

Browse Source
This commit is contained in:
Gregory Ballantine 2018-03-31 23:24:47 -04:00
parent 8eae7150b7
commit 6ea7f4867a
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

@ -22,7 +22,7 @@
}, },
}, grain='os_family') %} }, grain='os_family') %}
{% set munin_node = salt['grains.filter_by']({ {% set munin_node_osmap = salt['grains.filter_by']({
'Debian': {}, 'Debian': {},
'RedHat': {}, 'RedHat': {},
'Arch': { 'Arch': {
@ -40,7 +40,7 @@
}, },
}, grain='os_family') %} }, grain='os_family') %}
{% set net_ssleay = salt['grains.filter_by']({ {% set net_ssleay_osmap = salt['grains.filter_by']({
'Debian': { 'Debian': {
'package': 'libnet-ssleay-perl', 'package': 'libnet-ssleay-perl',
}, },
@ -55,7 +55,7 @@
}, },
}, grain='os_family') %} }, grain='os_family') %}
{% set munin_tls = salt['grains.filter_by']({ {% set munin_tls_osmap = salt['grains.filter_by']({
'Debian': {}, 'Debian': {},
'RedHat': {}, 'RedHat': {},
'Arch': {}, 'Arch': {},
@ -72,7 +72,7 @@
{% set munin_master = salt['pillar.get']('munin:lookup:munin_master', default=default_settings.munin_master, merge=True) %} {% set munin_master = salt['pillar.get']('munin:lookup:munin_master', default=default_settings.munin_master, merge=True) %}
{% do default_settings.munin_node.update(munin_node_osmap) %} {% do default_settings.munin_node.update(munin_node_osmap) %}
{% set munin_node = salt['pillar.get']('munin:lookup:munin_node', default=default_settings.munin_node, merge=True) %} {% set munin_node = salt['pillar.get']('munin:lookup:munin_node', default=default_settings.munin_node, merge=True) %}
{% do default_settings.net_ssleay.update(munin_ssleay_osmap) %} {% do default_settings.net_ssleay.update(net_ssleay_osmap) %}
{% set net_ssleay = salt['pillar.get']('munin:lookup:munin_ssleay', default=default_settings.net_ssleay, merge=True) %} {% set net_ssleay = salt['pillar.get']('munin:lookup:munin_ssleay', default=default_settings.net_ssleay, merge=True) %}
{% do default_settings.munin_tls.update(munin_tls_osmap) %} {% do default_settings.munin_tls.update(munin_tls_osmap) %}
{% set munin_tls = salt['pillar.get']('munin:lookup:munin_tls', default=default_settings.munin_tls, merge=True) %} {% set munin_tls = salt['pillar.get']('munin:lookup:munin_tls', default=default_settings.munin_tls, merge=True) %}