diff options
author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 10:02:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-28 10:02:34 -0500 |
commit | 192b8477faa018d31893b322f43f356ce3ac1c80 (patch) | |
tree | 7ed69c98a8a28b352e33b0f9edb95eeb5b321d34 /roles/openshift_logging_kibana | |
parent | 34de448dd7ff5c671628092e51668aa5c89e8e74 (diff) | |
parent | 37636c325aed612c06f86cbb042fc14bcbde218c (diff) | |
download | openshift-192b8477faa018d31893b322f43f356ce3ac1c80.tar.gz openshift-192b8477faa018d31893b322f43f356ce3ac1c80.tar.bz2 openshift-192b8477faa018d31893b322f43f356ce3ac1c80.tar.xz openshift-192b8477faa018d31893b322f43f356ce3ac1c80.zip |
Merge pull request #6259 from adelton/issue-6255
dist.iteritems() no longer exists in Python 3.
Diffstat (limited to 'roles/openshift_logging_kibana')
-rw-r--r-- | roles/openshift_logging_kibana/templates/kibana.j2 | 2 | ||||
-rw-r--r-- | roles/openshift_logging_kibana/templates/route_reencrypt.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2 index 4ff86729a..57d216373 100644 --- a/roles/openshift_logging_kibana/templates/kibana.j2 +++ b/roles/openshift_logging_kibana/templates/kibana.j2 @@ -29,7 +29,7 @@ spec: serviceAccountName: aggregated-logging-kibana {% if kibana_node_selector is iterable and kibana_node_selector | length > 0 %} nodeSelector: -{% for key, value in kibana_node_selector.iteritems() %} +{% for key, value in kibana_node_selector.items() %} {{ key }}: "{{ value }}" {% endfor %} {% endif %} diff --git a/roles/openshift_logging_kibana/templates/route_reencrypt.j2 b/roles/openshift_logging_kibana/templates/route_reencrypt.j2 index cf8a9e65f..d2e8b8bcb 100644 --- a/roles/openshift_logging_kibana/templates/route_reencrypt.j2 +++ b/roles/openshift_logging_kibana/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 %} |