summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_curator
diff options
context:
space:
mode:
authorJeff Cantrill <jcantril@redhat.com>2017-10-26 10:15:25 -0400
committerJeff Cantrill <jcantril@redhat.com>2017-10-27 09:01:57 -0400
commit205d03455cf37d66f3629de7951463d755b72b16 (patch)
tree58a894d2b928fcdcb542b50ba2eb6fb56f89cc54 /roles/openshift_logging_curator
parent34f6e3e2543ab961bcded8cbc7e531a7bbf5b02c (diff)
downloadopenshift-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_curator')
-rw-r--r--roles/openshift_logging_curator/tasks/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml
index b4ddf45d9..fcaf18ed4 100644
--- a/roles/openshift_logging_curator/tasks/main.yaml
+++ b/roles/openshift_logging_curator/tasks/main.yaml
@@ -90,7 +90,7 @@
es_host: "{{ openshift_logging_curator_es_host }}"
es_port: "{{ openshift_logging_curator_es_port }}"
curator_cpu_limit: "{{ openshift_logging_curator_cpu_limit }}"
- curator_cpu_request: "{{ openshift_logging_curator_cpu_request }}"
+ curator_cpu_request: "{{ openshift_logging_curator_cpu_request | min_cpu(openshift_logging_curator_cpu_limit | default(none)) }}"
curator_memory_limit: "{{ openshift_logging_curator_memory_limit }}"
curator_replicas: "{{ openshift_logging_curator_replicas | default (1) }}"
curator_node_selector: "{{openshift_logging_curator_nodeselector | default({})}}"