Merge pull request #6679 from vrutkovs/logging-py3-dicts

Automatic merge from submit-queue.

logging: fix jinja filters to support py3

roles/openshift_logging/tasks/install_logging.yaml

@@ -94,7 +94,7 @@
     _es_configmap: "{{ openshift_logging_facts | walk('elasticsearch#configmaps#logging-elasticsearch#elasticsearch.yml', '{}', delimiter='#') | from_yaml }}"
 
   with_together:
-  - "{{ openshift_logging_facts.elasticsearch.deploymentconfigs.values() }}"
+  - "{{ openshift_logging_facts.elasticsearch.deploymentconfigs.values() | list }}"
   - "{{ openshift_logging_facts.elasticsearch.pvcs }}"
   - "{{ es_indices }}"
   loop_control:
@@ -169,7 +169,7 @@
     _es_configmap: "{{ openshift_logging_facts | walk('elasticsearch_ops#configmaps#logging-elasticsearch-ops#elasticsearch.yml', '{}', delimiter='#') | from_yaml }}"
 
   with_together:
-  - "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.values() }}"
+  - "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.values() | list }}"
   - "{{ openshift_logging_facts.elasticsearch_ops.pvcs }}"
   - "{{ es_ops_indices }}"
   loop_control:

roles/openshift_logging_fluentd/tasks/main.yaml

@@ -172,8 +172,8 @@
     app_port: "{{ openshift_logging_fluentd_app_port }}"
     ops_host: "{{ openshift_logging_fluentd_ops_host }}"
     ops_port: "{{ openshift_logging_fluentd_ops_port }}"
-    fluentd_nodeselector_key: "{{ openshift_logging_fluentd_nodeselector.keys()[0] }}"
-    fluentd_nodeselector_value: "{{ openshift_logging_fluentd_nodeselector.values()[0] }}"
+    fluentd_nodeselector_key: "{{ openshift_logging_fluentd_nodeselector.keys() | first }}"
+    fluentd_nodeselector_value: "{{ openshift_logging_fluentd_nodeselector.values() | first }}"
     fluentd_cpu_limit: "{{ openshift_logging_fluentd_cpu_limit }}"
     fluentd_cpu_request: "{{ openshift_logging_fluentd_cpu_request | min_cpu(openshift_logging_fluentd_cpu_limit | default(none)) }}"
     fluentd_memory_limit: "{{ openshift_logging_fluentd_memory_limit }}"