summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-07-03 12:01:26 -0400
committerGitHub <noreply@github.com>2017-07-03 12:01:26 -0400
commitd5d909e592d465e3dc65f88778cc47e8f997fa45 (patch)
tree8dc3ddc0145b2ab2a3631a97fa12c93217dcc666
parent0d0f54af3a02cd0e228210dfae95806d4e644c3b (diff)
parent1557dc2b866af96eddb90fa64d81ec7135f06343 (diff)
downloadopenshift-d5d909e592d465e3dc65f88778cc47e8f997fa45.tar.gz
openshift-d5d909e592d465e3dc65f88778cc47e8f997fa45.tar.bz2
openshift-d5d909e592d465e3dc65f88778cc47e8f997fa45.tar.xz
openshift-d5d909e592d465e3dc65f88778cc47e8f997fa45.zip
Merge pull request #4641 from wozniakjan/logging_es_probe
Merged by openshift-bot
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j210
1 files changed, 0 insertions, 10 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index 1ca4220a3..7424db6f6 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -90,9 +90,6 @@ 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 %}"
@@ -109,13 +106,6 @@ spec:
readOnly: true
- name: elasticsearch-storage
mountPath: /elasticsearch/persistent
- readinessProbe:
- exec:
- command:
- - "/usr/share/elasticsearch/probe/readiness.sh"
- initialDelaySeconds: 10
- timeoutSeconds: 30
- periodSeconds: 5
volumes:
- name: elasticsearch
secret: