summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-22 20:13:54 -0500
committerGitHub <noreply@github.com>2017-03-22 20:13:54 -0500
commit1570b6ef091024f8403160b22144cc4edca6ff0e (patch)
treee128b5443bc2bb3dca2b55d1f61134342af7c711
parent3d1f4de1f4fe36163c2b62ef2c385ac746baf598 (diff)
parentf38eef42dcaf32402aec95c0da2fb4e0f7e5dfd5 (diff)
downloadopenshift-1570b6ef091024f8403160b22144cc4edca6ff0e.tar.gz
openshift-1570b6ef091024f8403160b22144cc4edca6ff0e.tar.bz2
openshift-1570b6ef091024f8403160b22144cc4edca6ff0e.tar.xz
openshift-1570b6ef091024f8403160b22144cc4edca6ff0e.zip
Merge pull request #3731 from jcantrill/min_masters
Merged by openshift-bot
-rw-r--r--roles/openshift_logging/templates/elasticsearch.yml.j21
-rw-r--r--roles/openshift_logging/vars/main.yaml2
2 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_logging/templates/elasticsearch.yml.j2 b/roles/openshift_logging/templates/elasticsearch.yml.j2
index 21708dc12..a030c26b5 100644
--- a/roles/openshift_logging/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging/templates/elasticsearch.yml.j2
@@ -29,6 +29,7 @@ cloud:
discovery:
type: kubernetes
zen.ping.multicast.enabled: false
+ zen.minimum_master_nodes: {{es_min_masters}}
gateway:
expected_master_nodes: ${NODE_QUORUM}
diff --git a/roles/openshift_logging/vars/main.yaml b/roles/openshift_logging/vars/main.yaml
index 07cc05683..c3064cee9 100644
--- a/roles/openshift_logging/vars/main.yaml
+++ b/roles/openshift_logging/vars/main.yaml
@@ -1,6 +1,8 @@
---
openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
es_node_quorum: "{{openshift_logging_es_cluster_size|int/2 + 1}}"
+es_min_masters_default: "{{ (openshift_logging_es_cluster_size | int / 2 | round(0,'floor') + 1) | int }}"
+es_min_masters: "{{ (openshift_logging_es_cluster_size == 1) | ternary(1, es_min_masters_default)}}"
es_recover_after_nodes: "{{openshift_logging_es_cluster_size|int - 1}}"
es_recover_expected_nodes: "{{openshift_logging_es_cluster_size|int}}"
es_ops_node_quorum: "{{openshift_logging_es_ops_cluster_size|int/2 + 1}}"