From 3ba384a0bd6bedbc71a937fe538fa72d44c08033 Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme <jan.philipp@timme.it> Date: Mon, 11 Nov 2019 15:36:22 +0100 Subject: [PATCH] Replace .iteritems() with items() for python3 compatibility --- postgrest/nginx.sls | 2 +- postgrest/postgrest.sls | 2 +- postgrest/tpl/postgrest.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/postgrest/nginx.sls b/postgrest/nginx.sls index 6212505..823c328 100644 --- a/postgrest/nginx.sls +++ b/postgrest/nginx.sls @@ -1,4 +1,4 @@ -{% for instance_name, instance_conf in salt['pillar.get']("postgrest:instances").iteritems() %} +{% for instance_name, instance_conf in salt['pillar.get']("postgrest:instances").items() %} {% if instance_conf.nginx is defined %} postgrest_{{ instance_name }}_nginx_conf: diff --git a/postgrest/postgrest.sls b/postgrest/postgrest.sls index 147fea6..20c5f61 100644 --- a/postgrest/postgrest.sls +++ b/postgrest/postgrest.sls @@ -1,4 +1,4 @@ -{% for instance_name, instance_conf in salt['pillar.get']("postgrest:instances").iteritems() %} +{% for instance_name, instance_conf in salt['pillar.get']("postgrest:instances").items() %} {% set tag = instance_conf.tag %} postgrest_{{ instance_name }}_fetch: diff --git a/postgrest/tpl/postgrest.conf b/postgrest/tpl/postgrest.conf index bd9848f..17b9498 100644 --- a/postgrest/tpl/postgrest.conf +++ b/postgrest/tpl/postgrest.conf @@ -1,3 +1,3 @@ # This file is written by salt. Don't even think about it. -{% for key, value in postgrest_conf.iteritems() %}{{ key }} = {% if value is string %}"{{ value }}"{% else %}{{ value }}{% endif %} +{% for key, value in postgrest_conf.items() %}{{ key }} = {% if value is string %}"{{ value }}"{% else %}{{ value }}{% endif %} {% endfor %} -- GitLab