summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-05-26 15:47:37 -0400
committerGitHub <noreply@github.com>2017-05-26 15:47:37 -0400
commit670ee735410691c5e2f2709aa17bb2e8e5be3e84 (patch)
treef8dd32a2df6a0ffdd7d4f51686c1c3a9d97bb425
parentf83f54d23c665ffe5096ea2073ba9e39c4ea1996 (diff)
parenta5aaf6af1ea1177ae65c27ff928166eab0dbc09d (diff)
downloadopenshift-670ee735410691c5e2f2709aa17bb2e8e5be3e84.tar.gz
openshift-670ee735410691c5e2f2709aa17bb2e8e5be3e84.tar.bz2
openshift-670ee735410691c5e2f2709aa17bb2e8e5be3e84.tar.xz
openshift-670ee735410691c5e2f2709aa17bb2e8e5be3e84.zip
Merge pull request #4288 from wozniakjan/logging_es_fix
openshift_logging: increasing *_elasticsearch_* default CPU and memory
-rw-r--r--roles/openshift_logging_elasticsearch/defaults/main.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml
index 7923059da..c0b5d394e 100644
--- a/roles/openshift_logging_elasticsearch/defaults/main.yml
+++ b/roles/openshift_logging_elasticsearch/defaults/main.yml
@@ -5,10 +5,10 @@ openshift_logging_elasticsearch_image_version: "{{ openshift_hosted_logging_depl
openshift_logging_elasticsearch_image_pull_secret: "{{ openshift_hosted_logging_image_pull_secret | default('') }}"
openshift_logging_elasticsearch_namespace: logging
-openshift_logging_elasticsearch_nodeselector: ""
-openshift_logging_elasticsearch_cpu_limit: 100m
-openshift_logging_elasticsearch_memory_limit: 512Mi
-openshift_logging_elasticsearch_recover_after_time: 5m
+openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_nodeselector | default('') }}"
+openshift_logging_elasticsearch_cpu_limit: 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') }}"
openshift_logging_elasticsearch_replica_count: 1