summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch/templates/es.j2
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-05-18 19:45:19 -0500
committerewolinetz <ewolinet@redhat.com>2017-05-22 10:42:54 -0500
commit7426996929fe298f4da0b238e38d91fb929b5112 (patch)
tree13d0f61eceb13967e862fcaa3b6c776b83ed4e95 /roles/openshift_logging_elasticsearch/templates/es.j2
parent186d744cee0bda007e196358da5fe5e94187e0d3 (diff)
downloadopenshift-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/es.j2')
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j210
1 files changed, 7 insertions, 3 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index 36390a2c2..d2db8432e 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -78,9 +78,6 @@ spec:
name: "NODE_QUORUM"
value: "{{es_node_quorum | int}}"
-
- name: "RECOVER_AFTER_NODES"
- value: "{{es_recover_after_nodes}}"
- -
name: "RECOVER_EXPECTED_NODES"
value: "{{es_recover_expected_nodes}}"
-
@@ -103,6 +100,13 @@ spec:
readOnly: true
- name: elasticsearch-storage
mountPath: /elasticsearch/persistent
+ readinessProbe:
+ exec:
+ command:
+ - "/usr/share/elasticsearch/probe/readiness.sh"
+ initialDelaySeconds: 5
+ timeoutSeconds: 4
+ periodSeconds: 5
volumes:
- name: elasticsearch
secret: