summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2017-12-12 10:18:38 -0800
committerNoriko Hosoi <nhosoi@redhat.com>2017-12-14 10:08:55 -0800
commitf1748bdcb0d9b14af2f319a02ff72afd9074fae0 (patch)
tree0bdbf0acb2082e145536a53f6ce03e72d6dda9e6
parent67db90531b25cae235eaa093d3d55a20c08d482d (diff)
downloadopenshift-f1748bdcb0d9b14af2f319a02ff72afd9074fae0.tar.gz
openshift-f1748bdcb0d9b14af2f319a02ff72afd9074fae0.tar.bz2
openshift-f1748bdcb0d9b14af2f319a02ff72afd9074fae0.tar.xz
openshift-f1748bdcb0d9b14af2f319a02ff72afd9074fae0.zip
openshift_logging_{fluentd,mux}_file_buffer_limit mismatch
. fixing a typo in fluentd template . adjusting the default value of openshift_logging_mux_file_buffer_limit
-rw-r--r--roles/openshift_logging_fluentd/templates/fluentd.j22
-rw-r--r--roles/openshift_logging_mux/defaults/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index 10283316c..c6256cf49 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -130,7 +130,7 @@ spec:
containerName: "{{ daemonset_container_name }}"
resource: limits.memory
- name: "FILE_BUFFER_LIMIT"
- value: "{{ openshift_logging_fluentd_file_buffer_limit | default('256i') }}"
+ value: "{{ openshift_logging_fluentd_file_buffer_limit | default('256Mi') }}"
{% if openshift_logging_mux_client_mode is defined and
((openshift_logging_mux_allow_external is defined and openshift_logging_mux_allow_external | bool) or
(openshift_logging_use_mux is defined and openshift_logging_use_mux | bool)) %}
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml
index 1e6c501bf..db6f23126 100644
--- a/roles/openshift_logging_mux/defaults/main.yml
+++ b/roles/openshift_logging_mux/defaults/main.yml
@@ -63,4 +63,4 @@ openshift_logging_mux_file_buffer_pvc_access_modes: ['ReadWriteOnce']
openshift_logging_mux_file_buffer_storage_group: '65534'
openshift_logging_mux_file_buffer_pvc_prefix: "logging-mux"
-openshift_logging_mux_file_buffer_limit: 256Mi
+openshift_logging_mux_file_buffer_limit: 2Gi