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_kibana | |
| 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_kibana')
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index 809f7a631..8ef8ede9a 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/roles/openshift_logging_kibana/tasks/main.yaml @@ -230,10 +230,10 @@ es_host: "{{ openshift_logging_kibana_es_host }}" es_port: "{{ openshift_logging_kibana_es_port }}" kibana_cpu_limit: "{{ openshift_logging_kibana_cpu_limit }}" - kibana_cpu_request: "{{ openshift_logging_kibana_cpu_request }}" + kibana_cpu_request: "{{ openshift_logging_kibana_cpu_request | min_cpu(openshift_logging_kibana_cpu_limit | default(none)) }}" kibana_memory_limit: "{{ openshift_logging_kibana_memory_limit }}" kibana_proxy_cpu_limit: "{{ openshift_logging_kibana_proxy_cpu_limit }}" - kibana_proxy_cpu_request: "{{ openshift_logging_kibana_proxy_cpu_request }}" + kibana_proxy_cpu_request: "{{ openshift_logging_kibana_proxy_cpu_request | min_cpu(openshift_logging_kibana_proxy_cpu_limit | default(none)) }}" kibana_proxy_memory_limit: "{{ openshift_logging_kibana_proxy_memory_limit }}" kibana_replicas: "{{ openshift_logging_kibana_replicas | default (1) }}" kibana_node_selector: "{{ openshift_logging_kibana_nodeselector | default({}) }}" |