diff options
| author | Jeff Cantrill <jcantril@redhat.com> | 2017-05-08 09:07:55 -0400 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-05-11 11:28:13 -0400 |
| commit | 2505424d99ebd32a05f6dd33d0bd7474ca6e441e (patch) | |
| tree | 995e1340971df51f48151cf94cf0a3f1553a9ef8 /roles/openshift_logging/vars | |
| parent | 74e4c9d9976f0eb529fdd7fb21cd88ad1a47553f (diff) | |
| download | openshift-2505424d99ebd32a05f6dd33d0bd7474ca6e441e.tar.gz openshift-2505424d99ebd32a05f6dd33d0bd7474ca6e441e.tar.bz2 openshift-2505424d99ebd32a05f6dd33d0bd7474ca6e441e.tar.xz openshift-2505424d99ebd32a05f6dd33d0bd7474ca6e441e.zip | |
bug 1448860. Change recovery_after_nodes to match node_quorum
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'] |