iteritems() -> items() for python3

This commit is contained in:
Florian Ermisch 2015-08-18 16:12:36 +02:00
parent b0e964f942
commit 17cc04c041

View File

@ -3,7 +3,7 @@
{% set used_sudo = [] %} {% set used_sudo = [] %}
{% set used_googleauth = [] %} {% set used_googleauth = [] %}
{%- for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %} {%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
{%- if user == None -%} {%- if user == None -%}
{%- set user = {} -%} {%- set user = {} -%}
{%- endif -%} {%- endif -%}
@ -25,7 +25,7 @@ include:
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{% for name, user in pillar.get('users', {}).iteritems() if user.absent is not defined or not user.absent %} {% for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
{%- if user == None -%} {%- if user == None -%}
{%- set user = {} -%} {%- set user = {} -%}
{%- endif -%} {%- endif -%}
@ -330,7 +330,7 @@ users_googleauth-{{ svc }}-{{ name }}:
{% endfor %} {% endfor %}
{% for name, user in pillar.get('users', {}).iteritems() if user.absent is defined and user.absent %} {% for name, user in pillar.get('users', {}).items() if user.absent is defined and user.absent %}
users_absent_user_{{ name }}: users_absent_user_{{ name }}:
{% if 'purge' in user or 'force' in user %} {% if 'purge' in user or 'force' in user %}
user.absent: user.absent: