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_elasticsearch | |
| 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_elasticsearch')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 7aabdc861..e7ef443bd 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -354,7 +354,7 @@ image: "{{ openshift_logging_elasticsearch_image_prefix }}logging-elasticsearch:{{ openshift_logging_elasticsearch_image_version }}" proxy_image: "{{ openshift_logging_elasticsearch_proxy_image_prefix }}oauth-proxy:{{ openshift_logging_elasticsearch_proxy_image_version }}" es_cpu_limit: "{{ openshift_logging_elasticsearch_cpu_limit | default('') }}" - es_cpu_request: "{{ openshift_logging_elasticsearch_cpu_request }}" + es_cpu_request: "{{ openshift_logging_elasticsearch_cpu_request | min_cpu(openshift_logging_elasticsearch_cpu_limit | default(none)) }}" es_memory_limit: "{{ openshift_logging_elasticsearch_memory_limit }}" es_node_selector: "{{ openshift_logging_elasticsearch_nodeselector | default({}) }}" es_storage_groups: "{{ openshift_logging_elasticsearch_storage_group | default([]) }}" |