浏览代码

iteritems() -> items() for python3

tags/v0.45.0
Florian Ermisch 9 年前
父节点
当前提交
17cc04c041
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. +3
    -3
      users/init.sls

+ 3
- 3
users/init.sls 查看文件

@@ -3,7 +3,7 @@
{% set used_sudo = [] %}
{% 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 -%}
{%- set user = {} -%}
{%- endif -%}
@@ -25,7 +25,7 @@ include:
{%- 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 -%}
{%- set user = {} -%}
{%- endif -%}
@@ -330,7 +330,7 @@ users_googleauth-{{ svc }}-{{ name }}:
{% 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 }}:
{% if 'purge' in user or 'force' in user %}
user.absent:

正在加载...
取消
保存