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

Merge pull request #188 from abednarik/fix_deprecated_iteritems_method

Browse Source 
Replace deprecated iteritems() with items()
This commit is contained in:
Forrest 2015-11-16 18:34:28 -08:00
commit a33937d9e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/formulas.sls
View File

@ -4,7 +4,7 @@
{% from "salt/formulas.jinja" import formulas_git_opt with context %} {% from "salt/formulas.jinja" import formulas_git_opt with context %}
# Loop over all formulas listed in pillar data # 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 %} {% for entry in entries %}
{% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %} {% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
@ -17,7 +17,7 @@
{{ basedir }}: {{ basedir }}:
file.directory: file.directory:
{%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
{'makedirs': True}).iteritems() %} {'makedirs': True}).items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
{%- endfor %} {%- endfor %}
{% endif %} {% endif %}
@ -31,7 +31,7 @@
git.latest: git.latest:
- name: {{ baseurl }}/{{ entry }}.git - name: {{ baseurl }}/{{ entry }}.git
- target: {{ gitdir }} - target: {{ gitdir }}
{%- for key, value in options.iteritems() %} {%- for key, value in options.items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
{%- endfor %} {%- endfor %}
- require: - require: