summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-07 16:50:54 -0400
committerGitHub <noreply@github.com>2017-06-07 16:50:54 -0400
commitcb3ccbf3c4a8a79cda7f3b7b9dc70111575a8aa6 (patch)
treeb9fab41244905ed32befc50e2fb6dc61bca23bf0
parentf510d55043a94f3e9ad6972a2bef3ff45662fa4a (diff)
parent2360841f17d33e4786cf5a49a98a0a4904543e8b (diff)
downloadopenshift-cb3ccbf3c4a8a79cda7f3b7b9dc70111575a8aa6.tar.gz
openshift-cb3ccbf3c4a8a79cda7f3b7b9dc70111575a8aa6.tar.bz2
openshift-cb3ccbf3c4a8a79cda7f3b7b9dc70111575a8aa6.tar.xz
openshift-cb3ccbf3c4a8a79cda7f3b7b9dc70111575a8aa6.zip
Merge pull request #4351 from ewolinetz/logging_es_readiness_probe
Merged by openshift-bot
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j27
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index e129205ca..bd2289f0d 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -84,6 +84,9 @@ spec:
name: "RECOVER_AFTER_TIME"
value: "{{openshift_logging_elasticsearch_recover_after_time}}"
-
+ name: "READINESS_PROBE_TIMEOUT"
+ value: "30"
+ -
name: "IS_MASTER"
value: "{% if deploy_type in ['data-master', 'master'] %}true{% else %}false{% endif %}"
@@ -104,8 +107,8 @@ spec:
exec:
command:
- "/usr/share/elasticsearch/probe/readiness.sh"
- initialDelaySeconds: 5
- timeoutSeconds: 4
+ initialDelaySeconds: 10
+ timeoutSeconds: 30
periodSeconds: 5
volumes:
- name: elasticsearch