From e1b3fe7618186f84136675e24e6c3ec7877ea944 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Sun, 4 Jun 2017 20:07:23 -0700 Subject: Adding the defaults for openshift_logging_fluentd_{cpu,memory}_limit to roles/openshift_logging_fluentd/defaults/main.yml. Adding the description for openshift_hosted_logging_fluentd_{cpu,memory}_limit to README.md. Replaced openshift_hosted_logging_mux_.* with openshift_logging_mux_.*. --- roles/openshift_logging_fluentd/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_logging_fluentd') diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml index 228196d74..41481f87e 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: 100m -openshift_logging_fluentd_memory_limit: 512Mi +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_hosts: ['--all'] # float time in seconds to wait between node labelling -- cgit v1.2.1