diff options
author | Rich Megginson <rmeggins@redhat.com> | 2017-07-06 09:27:19 -0600 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2017-07-06 12:26:11 -0600 |
commit | c9e92b47333d22a3cf47e76ac7248deb23263500 (patch) | |
tree | 09e594b4014aa66cc46b690b279597f1e9b57039 /roles/openshift_logging_fluentd/tasks/main.yaml | |
parent | 1d0f56ca913af24a1ba4b46b25d719619216df92 (diff) | |
download | openshift-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_fluentd/tasks/main.yaml')
-rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index 30b596e22..55de2ae8d 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -15,19 +15,15 @@ msg: Invalid deployment type, one of ['hosted', 'secure-aggregator', 'secure-host'] allowed when: not openshift_logging_fluentd_deployment_type in __allowed_fluentd_types -- include: determine_version.yaml +- debug: + msg: openshift_logging_fluentd_use_journal is deprecated. Fluentd will automatically detect which logging driver is being used. + when: openshift_logging_fluentd_use_journal is defined -- set_fact: - openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal }}" - when: - - openshift_hosted_logging_use_journal is defined - - openshift_logging_fluentd_use_journal is not defined +- debug: + msg: openshift_hosted_logging_use_journal is deprecated. Fluentd will automatically detect which logging driver is being used. + when: openshift_hosted_logging_use_journal is defined -- set_fact: - openshift_logging_fluentd_use_journal: "{{ __fluentd_use_journal }}" - when: - - openshift_hosted_logging_use_journal is not defined - - openshift_logging_fluentd_use_journal is not defined +- include: determine_version.yaml # allow passing in a tempdir - name: Create temp directory for doing work in |