summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-11 05:08:05 -0800
committerGitHub <noreply@github.com>2018-01-11 05:08:05 -0800
commitf472139a1001508aa1b245e816395313acccaf1d (patch)
tree7cdf357e0afe8855293a8decfcb3c8f0fd310af9 /roles/openshift_logging_fluentd
parent46f0a28d9ea4d9d599fc93ea2786eff51067432d (diff)
parentd07d3d922cec9e88fe16d4392c738ec7e3e1f82e (diff)
downloadopenshift-f472139a1001508aa1b245e816395313acccaf1d.tar.gz
openshift-f472139a1001508aa1b245e816395313acccaf1d.tar.bz2
openshift-f472139a1001508aa1b245e816395313acccaf1d.tar.xz
openshift-f472139a1001508aa1b245e816395313acccaf1d.zip
Merge pull request #6679 from vrutkovs/logging-py3-dicts
Automatic merge from submit-queue. logging: fix jinja filters to support py3
Diffstat (limited to 'roles/openshift_logging_fluentd')
-rw-r--r--roles/openshift_logging_fluentd/tasks/main.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml
index 529859983..79ebbca08 100644
--- a/roles/openshift_logging_fluentd/tasks/main.yaml
+++ b/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 }}"