diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-10-20 16:57:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-20 16:57:58 -0400 |
commit | ac2af73540c957aedd74e523646645cd36e8c130 (patch) | |
tree | f6ebe672125033d50e329eb88bd46e7ae82b51c8 /roles/openshift_logging_elasticsearch/defaults/main.yml | |
parent | e758bbe9739596f5e50b5a861198e5060d830d9b (diff) | |
parent | 578ac5b348fa3e9c7d0d05e3a0f579839ecd79dd (diff) | |
download | openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.gz openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.bz2 openshift-ac2af73540c957aedd74e523646645cd36e8c130.tar.xz openshift-ac2af73540c957aedd74e523646645cd36e8c130.zip |
Merge pull request #5748 from portante/fix-cpu-limits
Use "requests" for CPU resources instead of limits
Diffstat (limited to 'roles/openshift_logging_elasticsearch/defaults/main.yml')
-rw-r--r-- | roles/openshift_logging_elasticsearch/defaults/main.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml index fc48b7f71..9fc6fd1d8 100644 --- a/roles/openshift_logging_elasticsearch/defaults/main.yml +++ b/roles/openshift_logging_elasticsearch/defaults/main.yml @@ -6,7 +6,8 @@ openshift_logging_elasticsearch_image_pull_secret: "{{ openshift_hosted_logging_ openshift_logging_elasticsearch_namespace: logging openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector | default('') }}" -openshift_logging_elasticsearch_cpu_limit: "{{ openshift_logging_es_cpu_limit | default('1000m') }}" +openshift_logging_elasticsearch_cpu_limit: "{{ openshift_logging_es_cpu_limit | default('') }}" +openshift_logging_elasticsearch_cpu_request: "{{ openshift_logging_es_cpu_request | default('1000m') }}" openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_memory_limit | default('1Gi') }}" openshift_logging_elasticsearch_recover_after_time: "{{ openshift_logging_es_recover_after_time | default('5m') }}" @@ -40,7 +41,7 @@ openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_ # config the es plugin to write kibana index based on the index mode openshift_logging_elasticsearch_kibana_index_mode: 'unique' -openshift_logging_elasticsearch_proxy_cpu_limit: "100m" +openshift_logging_elasticsearch_proxy_cpu_request: "100m" openshift_logging_elasticsearch_proxy_memory_limit: "64Mi" openshift_logging_elasticsearch_prometheus_sa: "system:serviceaccount:{{openshift_prometheus_namespace | default('prometheus')}}:prometheus" |