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/tasks/main.yaml | |
| 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/tasks/main.yaml')
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index d350eb41e..8194223e8 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/tasks/main.yaml @@ -17,6 +17,18 @@ - include: determine_version.yaml +- 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 + +- 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 + # allow passing in a tempdir - name: Create temp directory for doing work in command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX |