Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-27 22:38:10 +01:00
Code Issues Activity

Use items() method to loop over nodegroups/log_granular_levels dictionaries

Browse Source 
Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
This commit is contained in:
Raphaël Hertzog 2014-12-23 17:35:26 +01:00
parent 02f8debea8
commit 2f2cd972ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/files/master.d/_defaults.conf
View File

@ -869,12 +869,12 @@ peer_run:
#
{% if 'log_granular_levels' in master %}
log_granular_levels:
{% for name, lvl in master['log_granular_levels'] %}
{% for name, lvl in master['log_granular_levels'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% elif 'log_granular_levels' in salt %}
log_granular_levels:
{% for name, lvl in salt['log_granular_levels'] %}
{% for name, lvl in salt['log_granular_levels'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% else %}
@ -891,12 +891,12 @@ log_granular_levels:
# group2: 'G@os:Debian and foo.domain.com'
{% if 'nodegroups' in master %}
nodegroups:
{% for name, lvl in master['nodegroups'] %}
{% for name, lvl in master['nodegroups'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% elif 'nodegroups' in salt %}
nodegroups:
{% for name, lvl in salt['nodegroups'] %}
{% for name, lvl in salt['nodegroups'].items() %}
{{ name }}: {{ lvl }}
{% endfor %}
{% endif %}