diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-04 20:07:23 -0700 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2017-06-05 12:21:44 -0700 |
| commit | e1b3fe7618186f84136675e24e6c3ec7877ea944 (patch) | |
| tree | 5c36cf184bca65ac3021a2440ef683e0f4fe29e4 /roles/openshift_logging_fluentd | |
| parent | 33f3a95da29ba2441911e761fbf8a5a2a553b9b9 (diff) | |
| download | openshift-e1b3fe7618186f84136675e24e6c3ec7877ea944.tar.gz openshift-e1b3fe7618186f84136675e24e6c3ec7877ea944.tar.bz2 openshift-e1b3fe7618186f84136675e24e6c3ec7877ea944.tar.xz openshift-e1b3fe7618186f84136675e24e6c3ec7877ea944.zip | |
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_.*.
Diffstat (limited to 'roles/openshift_logging_fluentd')
| -rw-r--r-- | roles/openshift_logging_fluentd/defaults/main.yml | 4 |
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 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 |