summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-07 17:09:24 -0400
committerGitHub <noreply@github.com>2017-09-07 17:09:24 -0400
commitfaed701d8fd50e7ce6540fd59c2f15fea82de0f6 (patch)
tree0fe245ae22b200876b68aeaabc755e16ad20e810 /roles
parent7b1c455c01d10ab5aa804ad48a5b60ab53d6a0c8 (diff)
parent7c237bd18221e87dbd5d11207554d64d558377af (diff)
downloadopenshift-faed701d8fd50e7ce6540fd59c2f15fea82de0f6.tar.gz
openshift-faed701d8fd50e7ce6540fd59c2f15fea82de0f6.tar.bz2
openshift-faed701d8fd50e7ce6540fd59c2f15fea82de0f6.tar.xz
openshift-faed701d8fd50e7ce6540fd59c2f15fea82de0f6.zip
Merge pull request #5209 from wozniakjan/logging_es_probe
Merged by openshift-bot
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j23
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j213
2 files changed, 15 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
index 0c06a7677..65b08d970 100644
--- a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
@@ -24,7 +24,8 @@ network:
cloud:
kubernetes:
- service: ${SERVICE_DNS}
+ pod_label: ${POD_LABEL}
+ pod_port: 9300
namespace: ${NAMESPACE}
discovery:
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index 5f2932541..3c8f390c4 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -90,6 +90,12 @@ spec:
name: "RECOVER_AFTER_TIME"
value: "{{openshift_logging_elasticsearch_recover_after_time}}"
-
+ name: "READINESS_PROBE_TIMEOUT"
+ value: "30"
+ -
+ name: "POD_LABEL"
+ value: "component={{component}}"
+ -
name: "IS_MASTER"
value: "{% if deploy_type in ['data-master', 'master'] %}true{% else %}false{% endif %}"
@@ -106,6 +112,13 @@ spec:
readOnly: true
- name: elasticsearch-storage
mountPath: /elasticsearch/persistent
+ readinessProbe:
+ exec:
+ command:
+ - "/usr/share/java/elasticsearch/probe/readiness.sh"
+ initialDelaySeconds: 10
+ timeoutSeconds: 30
+ periodSeconds: 5
volumes:
- name: elasticsearch
secret: