diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-06 15:10:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 15:10:10 -0400 |
| commit | 99ff4fdca9a24a1d5e3953fc7836aee898e62101 (patch) | |
| tree | 0be6c29d72cd0510a641a7af9cda0a0bbe68fcc8 /roles/openshift_logging/defaults | |
| parent | 7787e84fc2d10d1aa0a238999cf323a1e709550a (diff) | |
| parent | c9e92b47333d22a3cf47e76ac7248deb23263500 (diff) | |
| download | openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.gz openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.bz2 openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.xz openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.zip | |
Merge pull request #4696 from richm/bug-1466152
Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries
Diffstat (limited to 'roles/openshift_logging/defaults')
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index c243a6e4a..1c243f934 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -72,7 +72,6 @@ openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nod openshift_logging_fluentd_cpu_limit: 100m openshift_logging_fluentd_memory_limit: 512Mi openshift_logging_fluentd_es_copy: false -openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal if openshift_hosted_logging_use_journal is defined else (docker_log_driver == 'journald') | ternary(True, False) if docker_log_driver is defined else (openshift.docker.log_driver == 'journald') | ternary(True, False) if openshift.docker.log_driver is defined else openshift.docker.options | search('--log-driver=journald') if openshift.docker.options is defined else default(omit) }}" openshift_logging_fluentd_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}" openshift_logging_fluentd_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" openshift_logging_fluentd_hosts: ['--all'] |