summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_fluentd
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2017-06-05 13:46:33 -0700
committerNoriko Hosoi <nhosoi@redhat.com>2017-06-05 14:32:35 -0700
commit1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51 (patch)
tree726fdbc0122d6c4d633a0ef064b2562a315cd445 /roles/openshift_logging_fluentd
parente1b3fe7618186f84136675e24e6c3ec7877ea944 (diff)
downloadopenshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.gz
openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.bz2
openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.tar.xz
openshift-1bbac1e2e1b3ecc0b5ff4a43cfcdd770c3060a51.zip
Reverted most of this pr 4356 except:
adding openshift_logging_fluentd_buffer_queue_limit: 1024 openshift_logging_fluentd_buffer_size_limit: 1m openshift_logging_mux_buffer_queue_limit: 1024 openshift_logging_mux_buffer_size_limit: 1m and setting the matched environment variables.
Diffstat (limited to 'roles/openshift_logging_fluentd')
-rw-r--r--roles/openshift_logging_fluentd/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml
index 41481f87e..228196d74 100644
--- a/roles/openshift_logging_fluentd/defaults/main.yml
+++ b/roles/openshift_logging_fluentd/defaults/main.yml
@@ -8,8 +8,8 @@ openshift_logging_fluentd_namespace: logging
### Common settings
openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nodeselector_label | default('logging-infra-fluentd=true') | map_from_pairs }}"
-openshift_logging_fluentd_cpu_limit: "{{ openshift_hosted_logging_fluentd_cpu_limit | default('100m') }}"
-openshift_logging_fluentd_memory_limit: "{{ openshift_hosted_logging_fluentd_memory_limit | default('512Mi') }}"
+openshift_logging_fluentd_cpu_limit: 100m
+openshift_logging_fluentd_memory_limit: 512Mi
openshift_logging_fluentd_hosts: ['--all']
# float time in seconds to wait between node labelling