saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #360 from aboe76/python3_iter

Browse Source 
fix iteritems python3
This commit is contained in:
Javier Bértoli 2018-03-06 18:33:44 -03:00 committed by GitHub
commit 9a81ab2f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/files/master.d/f_defaults.conf
View File

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