summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/defaults
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2017-07-06 09:27:19 -0600
committerRich Megginson <rmeggins@redhat.com>2017-07-06 12:26:11 -0600
commitc9e92b47333d22a3cf47e76ac7248deb23263500 (patch)
tree09e594b4014aa66cc46b690b279597f1e9b57039 /roles/openshift_logging/defaults
parent1d0f56ca913af24a1ba4b46b25d719619216df92 (diff)
downloadopenshift-c9e92b47333d22a3cf47e76ac7248deb23263500.tar.gz
openshift-c9e92b47333d22a3cf47e76ac7248deb23263500.tar.bz2
openshift-c9e92b47333d22a3cf47e76ac7248deb23263500.tar.xz
openshift-c9e92b47333d22a3cf47e76ac7248deb23263500.zip
Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries
https://bugzilla.redhat.com/show_bug.cgi?id=1466152 Do not set openshift_logging_fluentd_use_journal or USE_JOURNAL at all unless it is explicitly set as an ansible param. It is almost always better to let fluentd figure out which log driver docker is using.
Diffstat (limited to 'roles/openshift_logging/defaults')
-rw-r--r--roles/openshift_logging/defaults/main.yml1
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']