Browse Source

Merge pull request #188 from abednarik/fix_deprecated_iteritems_method

Replace deprecated iteritems() with items()
tags/v0.57.0
Forrest 9 years ago
parent
commit
a33937d9e8
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      salt/formulas.sls

+ 3
- 3
salt/formulas.sls View File

{% 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 %}
{{ 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 %}
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:

Loading…
Cancel
Save