From c9e92b47333d22a3cf47e76ac7248deb23263500 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 6 Jul 2017 09:27:19 -0600 Subject: 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. --- roles/openshift_logging/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/openshift_logging/defaults/main.yml') 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'] -- cgit v1.2.3