summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/templates
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-23 19:33:35 -0500
committerGitHub <noreply@github.com>2017-03-23 19:33:35 -0500
commit6f48ddc49051bdcf74ade8ab9d85b47b9b6974d2 (patch)
tree5b94cee0a2dfd4447c03458a4aeed76b476d41e1 /roles/openshift_logging/templates
parentfdd0889b53b71f11eb9ac0e2abc951e6a24ac9d6 (diff)
parent9460defa2c2764b279322efb88a65149416683f5 (diff)
downloadopenshift-6f48ddc49051bdcf74ade8ab9d85b47b9b6974d2.tar.gz
openshift-6f48ddc49051bdcf74ade8ab9d85b47b9b6974d2.tar.bz2
openshift-6f48ddc49051bdcf74ade8ab9d85b47b9b6974d2.tar.xz
openshift-6f48ddc49051bdcf74ade8ab9d85b47b9b6974d2.zip
Merge pull request #3580 from lukas-vlcek/no_auto_expand_replicas
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/templates')
-rw-r--r--roles/openshift_logging/templates/elasticsearch.yml.j25
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_logging/templates/elasticsearch.yml.j2 b/roles/openshift_logging/templates/elasticsearch.yml.j2
index a030c26b5..3b9558685 100644
--- a/roles/openshift_logging/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging/templates/elasticsearch.yml.j2
@@ -6,9 +6,8 @@ script:
indexed: on
index:
- number_of_shards: 1
- number_of_replicas: 0
- auto_expand_replicas: 0-2
+ number_of_shards: {{ es_number_of_shards | default ('1') }}
+ number_of_replicas: {{ es_number_of_replicas | default ('0') }}
unassigned.node_left.delayed_timeout: 2m
translog:
flush_threshold_size: 256mb