diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-05-18 19:45:19 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-05-22 10:42:54 -0500 |
| commit | 7426996929fe298f4da0b238e38d91fb929b5112 (patch) | |
| tree | 13d0f61eceb13967e862fcaa3b6c776b83ed4e95 /roles/openshift_logging_fluentd/vars | |
| parent | 186d744cee0bda007e196358da5fe5e94187e0d3 (diff) | |
| download | openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.gz openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.bz2 openshift-7426996929fe298f4da0b238e38d91fb929b5112.tar.xz openshift-7426996929fe298f4da0b238e38d91fb929b5112.zip | |
Pulling changes from master branch
Diffstat (limited to 'roles/openshift_logging_fluentd/vars')
| -rw-r--r-- | roles/openshift_logging_fluentd/vars/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/vars/main.yml b/roles/openshift_logging_fluentd/vars/main.yml index ad3fb0bdd..f601b738e 100644 --- a/roles/openshift_logging_fluentd/vars/main.yml +++ b/roles/openshift_logging_fluentd/vars/main.yml @@ -2,3 +2,4 @@ __latest_fluentd_version: "3_5" __allowed_fluentd_versions: ["3_5", "3_6"] __allowed_fluentd_types: ["hosted", "secure-aggregator", "secure-host"] +__fluentd_use_journal: "{{ (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) }}" |