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 /roles/openshift_logging/vars | |
| 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
Diffstat (limited to 'roles/openshift_logging/vars')
| -rw-r--r-- | roles/openshift_logging/vars/main.yaml | 12 |
1 files changed, 4 insertions, 8 deletions
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'] |