From 2505424d99ebd32a05f6dd33d0bd7474ca6e441e Mon Sep 17 00:00:00 2001 From: Jeff Cantrill Date: Mon, 8 May 2017 09:07:55 -0400 Subject: bug 1448860. Change recovery_after_nodes to match node_quorum --- roles/openshift_logging/templates/elasticsearch.yml.j2 | 5 ++--- roles/openshift_logging/templates/es.j2 | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'roles/openshift_logging/templates') diff --git a/roles/openshift_logging/templates/elasticsearch.yml.j2 b/roles/openshift_logging/templates/elasticsearch.yml.j2 index 93c4d854c..355642cb7 100644 --- a/roles/openshift_logging/templates/elasticsearch.yml.j2 +++ b/roles/openshift_logging/templates/elasticsearch.yml.j2 @@ -28,11 +28,10 @@ cloud: discovery: type: kubernetes zen.ping.multicast.enabled: false - zen.minimum_master_nodes: {{es_min_masters}} + zen.minimum_master_nodes: ${NODE_QUORUM} gateway: - expected_master_nodes: ${NODE_QUORUM} - recover_after_nodes: ${RECOVER_AFTER_NODES} + recover_after_nodes: ${NODE_QUORUM} expected_nodes: ${RECOVER_EXPECTED_NODES} recover_after_time: ${RECOVER_AFTER_TIME} diff --git a/roles/openshift_logging/templates/es.j2 b/roles/openshift_logging/templates/es.j2 index f89855bf5..680c16cf4 100644 --- a/roles/openshift_logging/templates/es.j2 +++ b/roles/openshift_logging/templates/es.j2 @@ -77,9 +77,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}}" -- cgit v1.2.3