Browse Source

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

Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
tags/v0.57.0
Raphaël Hertzog 10 years ago
parent
commit
2f2cd972ac
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      salt/files/master.d/_defaults.conf

+ 4
- 4
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 %}

Loading…
Cancel
Save