diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-10-26 10:15:25 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-10-27 09:01:57 -0400 |
| commit | 205d03455cf37d66f3629de7951463d755b72b16 (patch) | |
| tree | 58a894d2b928fcdcb542b50ba2eb6fb56f89cc54 /roles/openshift_logging_fluentd | |
| parent | 34f6e3e2543ab961bcded8cbc7e531a7bbf5b02c (diff) | |
| download | openshift-205d03455cf37d66f3629de7951463d755b72b16.tar.gz openshift-205d03455cf37d66f3629de7951463d755b72b16.tar.bz2 openshift-205d03455cf37d66f3629de7951463d755b72b16.tar.xz openshift-205d03455cf37d66f3629de7951463d755b72b16.zip | |
bug 1506073. Lower cpu request for logging when it exceeds limit
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index f56810610..2f89c3f9f 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -154,7 +154,6 @@ path: "{{ generated_certs_dir }}/system.logging.fluentd.crt" # create Fluentd daemonset - # this should change based on the type of fluentd deployment to be done... # TODO: pass in aggregation configurations - name: Generate logging-fluentd daemonset definition @@ -173,7 +172,7 @@ fluentd_nodeselector_key: "{{ openshift_logging_fluentd_nodeselector.keys()[0] }}" fluentd_nodeselector_value: "{{ openshift_logging_fluentd_nodeselector.values()[0] }}" fluentd_cpu_limit: "{{ openshift_logging_fluentd_cpu_limit }}" - fluentd_cpu_request: "{{ openshift_logging_fluentd_cpu_request }}" + 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 }}" audit_container_engine: "{{ openshift_logging_fluentd_audit_container_engine | default(False) | bool }}" audit_log_file: "{{ openshift_logging_fluentd_audit_file | default() }}" |