diff options
author | ewolinetz <ewolinet@redhat.com> | 2017-05-18 19:45:19 -0500 |
---|---|---|
committer | ewolinetz <ewolinet@redhat.com> | 2017-05-22 10:42:54 -0500 |
commit | 7426996929fe298f4da0b238e38d91fb929b5112 (patch) | |
tree | 13d0f61eceb13967e862fcaa3b6c776b83ed4e95 /roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 | |
parent | 186d744cee0bda007e196358da5fe5e94187e0d3 (diff) | |
download | openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.gz openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.bz2 openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.xz openshift-7426996929fe298f4da0b238e38d91fb929b5112.zip |
Pulling changes from master branch
Diffstat (limited to 'roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2')
-rw-r--r-- | roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 index 2aaa44190..681f5a7e6 100644 --- a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 +++ b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 @@ -6,8 +6,8 @@ script: indexed: on index: - number_of_shards: 1 - number_of_replicas: 0 + 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 @@ -28,11 +28,10 @@ cloud: discovery: type: kubernetes zen.ping.multicast.enabled: false - zen.minimum_master_nodes: {{es_min_masters}} + zen.minimum_master_nodes: ${NODE_QUORUM} gateway: - expected_master_nodes: ${NODE_QUORUM} - recover_after_nodes: ${RECOVER_AFTER_NODES} + recover_after_nodes: ${NODE_QUORUM} expected_nodes: ${RECOVER_EXPECTED_NODES} recover_after_time: ${RECOVER_AFTER_TIME} @@ -49,7 +48,7 @@ openshift.searchguard: keystore.path: /etc/elasticsearch/secret/admin.jks truststore.path: /etc/elasticsearch/secret/searchguard.truststore -openshift.operations.allow_cluster_reader: {{allow_cluster_reader | default ('false')}} +openshift.operations.allow_cluster_reader: {{allow_cluster_reader | default (false)}} path: data: /elasticsearch/persistent/${CLUSTER_NAME}/data |