From 8b39b3776269b61a2cf1036c7615c7498c8ab4aa Mon Sep 17 00:00:00 2001 From: abednarik Date: Mon, 16 Nov 2015 22:05:36 -0300 Subject: [PATCH] Replace deprecated iteritems() with items() --- salt/formulas.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/formulas.sls b/salt/formulas.sls index 5eaaff5..b433bb5 100644 --- a/salt/formulas.sls +++ b/salt/formulas.sls @@ -4,7 +4,7 @@ {% from "salt/formulas.jinja" import formulas_git_opt with context %} # Loop over all formulas listed in pillar data -{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).iteritems() %} +{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %} {% for entry in entries %} {% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %} @@ -17,7 +17,7 @@ {{ basedir }}: file.directory: {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', - {'makedirs': True}).iteritems() %} + {'makedirs': True}).items() %} - {{ key }}: {{ value }} {%- endfor %} {% endif %} @@ -31,7 +31,7 @@ git.latest: - name: {{ baseurl }}/{{ entry }}.git - target: {{ gitdir }} - {%- for key, value in options.iteritems() %} + {%- for key, value in options.items() %} - {{ key }}: {{ value }} {%- endfor %} - require: