Browse Source

Merge pull request #360 from aboe76/python3_iter

fix iteritems python3
tags/v0.57.0
Javier Bértoli 6 years ago
parent
commit
9a81ab2f9b
No account linked to committer's email address
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      salt/files/master.d/f_defaults.conf

+ 5
- 5
salt/files/master.d/f_defaults.conf View File

@@ -508,20 +508,20 @@ publisher_acl_blacklist:
external_auth:
{%- for auth, users in cfg_master['external_auth']|dictsort %}
{{ auth }}:
{%- for user, commands in users.iteritems() %}
{%- for user, commands in users.items() %}
{{ user }}:
{%- for command in commands %}
{%- if command is mapping %}
{%- for target, targetcommands in command.iteritems() %}
{%- for target, targetcommands in command.items() %}
- {% raw %}'{% endraw %}{{ target }}{% raw %}'{% endraw %}:
{%- for targetcommand in targetcommands %}
{%- if targetcommand is mapping %}
{%- for module, options in targetcommand.iteritems() %}
{%- for module, options in targetcommand.items() %}
- {% raw %}'{% endraw %}{{ module }}{% raw %}'{% endraw %}:
{%- for category, arguments in options.iteritems() %}
{%- for category, arguments in options.items() %}
{% raw %}'{% endraw %}{{ category }}{% raw %}'{% endraw %}:
{%- if arguments is mapping %}
{%- for key, argument in arguments.iteritems() %}
{%- for key, argument in arguments.items() %}
{% raw %}'{% endraw %}{{ key }}{% raw %}'{% endraw %}: {% raw %}'{% endraw %}{{ argument }}{% raw %}'{% endraw %}
{%- endfor %}
{%- else %}

Loading…
Cancel
Save