summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-06 17:39:51 -0400
committerGitHub <noreply@github.com>2017-09-06 17:39:51 -0400
commite7320ee23086355aa45bcf4229008063d9bc5136 (patch)
tree77d32a668c52a1b5c46c0c9742168ad3d9762ce0 /roles/openshift_logging_elasticsearch
parentbb7502b5c22a0af691c552c1c86a4d4b1fb6b0bc (diff)
parentf0a12fafd1320cd717eea896bb27cf222df6e9c3 (diff)
downloadopenshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.gz
openshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.bz2
openshift-e7320ee23086355aa45bcf4229008063d9bc5136.tar.xz
openshift-e7320ee23086355aa45bcf4229008063d9bc5136.zip
Merge pull request #5276 from richm/master
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index cbe6b89f2..5f2932541 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -48,7 +48,7 @@ spec:
cpu: "{{es_cpu_limit}}"
{% endif %}
requests:
- memory: "512Mi"
+ memory: "{{es_memory_limit}}"
ports:
-
containerPort: 9200