summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-02-16 10:58:30 -0600
committerGitHub <noreply@github.com>2017-02-16 10:58:30 -0600
commit43330fbd7cb90491d63e54430394a309f7a41f73 (patch)
treed21ce9438644a9cb963a965443ef1c6c04bb5471
parent0cdca379b1d2fa3b36a01ec129ce6303fc31fe97 (diff)
parentde9b80326b8a9e2c600cdaa5d25fcebf38f840a3 (diff)
downloadopenshift-43330fbd7cb90491d63e54430394a309f7a41f73.tar.gz
openshift-43330fbd7cb90491d63e54430394a309f7a41f73.tar.bz2
openshift-43330fbd7cb90491d63e54430394a309f7a41f73.tar.xz
openshift-43330fbd7cb90491d63e54430394a309f7a41f73.zip
Merge pull request #3381 from jcantrill/bz_1420217_default_es_memory
bug 1420217. Default ES memory to be compariable to 3.4 deployer
-rw-r--r--roles/openshift_logging/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index dea1a889a..87fc7068f 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -62,7 +62,7 @@ openshift_logging_es_client_cert: /etc/fluent/keys/cert
openshift_logging_es_client_key: /etc/fluent/keys/key
openshift_logging_es_cluster_size: "{{ openshift_hosted_logging_elasticsearch_cluster_size | default(1) }}"
openshift_logging_es_cpu_limit: null
-openshift_logging_es_memory_limit: 1024Mi
+openshift_logging_es_memory_limit: 8Gi
openshift_logging_es_pv_selector: null
openshift_logging_es_pvc_dynamic: "{{ openshift_hosted_logging_elasticsearch_pvc_dynamic | default(False) }}"
openshift_logging_es_pvc_size: "{{ openshift_hosted_logging_elasticsearch_pvc_size | default('') }}"
@@ -80,7 +80,7 @@ openshift_logging_es_ops_client_cert: /etc/fluent/keys/cert
openshift_logging_es_ops_client_key: /etc/fluent/keys/key
openshift_logging_es_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}"
openshift_logging_es_ops_cpu_limit: null
-openshift_logging_es_ops_memory_limit: 1024Mi
+openshift_logging_es_ops_memory_limit: 8Gi
openshift_logging_es_ops_pv_selector: None
openshift_logging_es_ops_pvc_dynamic: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_dynamic | default(False) }}"
openshift_logging_es_ops_pvc_size: "{{ openshift_hosted_logging_elasticsearch_ops_pvc_size | default('') }}"