From 3c731605cc3230c8530ba244e4efab1141c79448 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Tue, 6 Mar 2018 20:52:04 +0100 Subject: [PATCH] fix iteritems python3 --- salt/files/master.d/f_defaults.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index cb84ad7..919b8c6 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -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 %}