diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-13 16:20:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-13 16:20:33 -0500 |
| commit | 4c774eac465877cb161adf09454c75213c83a131 (patch) | |
| tree | a440db31b98e331bfc5cb020297694e3528f218d | |
| parent | adb878d10240f9786520ce48b4710ac5b7da7dcd (diff) | |
| parent | 2505424d99ebd32a05f6dd33d0bd7474ca6e441e (diff) | |
| download | openshift-4c774eac465877cb161adf09454c75213c83a131.tar.gz openshift-4c774eac465877cb161adf09454c75213c83a131.tar.bz2 openshift-4c774eac465877cb161adf09454c75213c83a131.tar.xz openshift-4c774eac465877cb161adf09454c75213c83a131.zip | |
Merge pull request #4113 from jcantrill/bz1448860_make_recovery_after_nodes_to_node_quorum
Merged by openshift-bot
| -rw-r--r-- | roles/openshift_logging/templates/elasticsearch.yml.j2 | 5 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/es.j2 | 3 | ||||
| -rw-r--r-- | roles/openshift_logging/vars/main.yaml | 12 |
3 files changed, 6 insertions, 14 deletions
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 @@ -78,9 +78,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}}" - diff --git a/roles/openshift_logging/vars/main.yaml b/roles/openshift_logging/vars/main.yaml index e06625e3f..e561b41e2 100644 --- a/roles/openshift_logging/vars/main.yaml +++ b/roles/openshift_logging/vars/main.yaml @@ -1,12 +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}}" -es_ops_recover_after_nodes: "{{openshift_logging_es_ops_cluster_size|int - 1}}" -es_ops_recover_expected_nodes: "{{openshift_logging_es_ops_cluster_size|int}}" +es_node_quorum: "{{ (openshift_logging_es_cluster_size | int/2 | round(0,'floor') + 1) | int}}" +es_recover_expected_nodes: "{{openshift_logging_es_cluster_size | int}}" +es_ops_node_quorum: "{{ (openshift_logging_es_ops_cluster_size | int/2 | round(0,'floor') + 1) | int}}" +es_ops_recover_expected_nodes: "{{openshift_logging_es_ops_cluster_size | int}}" es_log_appenders: ['file', 'console'] |