diff options
author | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-27 12:32:48 +0100 |
---|---|---|
committer | Jan Pazdziora <jpazdziora@redhat.com> | 2017-11-27 13:11:45 +0100 |
commit | 37636c325aed612c06f86cbb042fc14bcbde218c (patch) | |
tree | 000e3bc81c52c3a87488b5e71bcb68fd13eb76d1 /roles/openshift_logging_elasticsearch | |
parent | 1ef463e727e202ba7595976f0478110b3b7585d0 (diff) | |
download | openshift-37636c325aed612c06f86cbb042fc14bcbde218c.tar.gz openshift-37636c325aed612c06f86cbb042fc14bcbde218c.tar.bz2 openshift-37636c325aed612c06f86cbb042fc14bcbde218c.tar.xz openshift-37636c325aed612c06f86cbb042fc14bcbde218c.zip |
dist.iteritems() no longer exists in Python 3.
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
3 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2 index 0c7d8b46e..0bfa9e85b 100644 --- a/roles/openshift_logging_elasticsearch/templates/es.j2 +++ b/roles/openshift_logging_elasticsearch/templates/es.j2 @@ -34,7 +34,7 @@ spec: {% endfor %} {% if es_node_selector is iterable and es_node_selector | length > 0 %} nodeSelector: -{% for key, value in es_node_selector.iteritems() %} +{% for key, value in es_node_selector.items() %} {{key}}: "{{value}}" {% endfor %} {% endif %} diff --git a/roles/openshift_logging_elasticsearch/templates/pvc.j2 b/roles/openshift_logging_elasticsearch/templates/pvc.j2 index 063f9c5ae..3c6896df4 100644 --- a/roles/openshift_logging_elasticsearch/templates/pvc.j2 +++ b/roles/openshift_logging_elasticsearch/templates/pvc.j2 @@ -6,7 +6,7 @@ metadata: logging-infra: support {% if annotations is defined %} annotations: -{% for key,value in annotations.iteritems() %} +{% for key,value in annotations.items() %} {{key}}: {{value}} {% endfor %} {% endif %} @@ -14,7 +14,7 @@ spec: {% if pv_selector is defined and pv_selector is mapping %} selector: matchLabels: -{% for key,value in pv_selector.iteritems() %} +{% for key,value in pv_selector.items() %} {{key}}: {{value}} {% endfor %} {% endif %} diff --git a/roles/openshift_logging_elasticsearch/templates/route_reencrypt.j2 b/roles/openshift_logging_elasticsearch/templates/route_reencrypt.j2 index cf8a9e65f..d2e8b8bcb 100644 --- a/roles/openshift_logging_elasticsearch/templates/route_reencrypt.j2 +++ b/roles/openshift_logging_elasticsearch/templates/route_reencrypt.j2 @@ -4,7 +4,7 @@ metadata: name: "{{obj_name}}" {% if labels is defined%} labels: -{% for key, value in labels.iteritems() %} +{% for key, value in labels.items() %} {{key}}: {{value}} {% endfor %} {% endif %} |