summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-06 15:10:10 -0400
committerGitHub <noreply@github.com>2017-07-06 15:10:10 -0400
commit99ff4fdca9a24a1d5e3953fc7836aee898e62101 (patch)
tree0be6c29d72cd0510a641a7af9cda0a0bbe68fcc8 /roles/openshift_logging/tasks
parent7787e84fc2d10d1aa0a238999cf323a1e709550a (diff)
parentc9e92b47333d22a3cf47e76ac7248deb23263500 (diff)
downloadopenshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.gz
openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.bz2
openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.tar.xz
openshift-99ff4fdca9a24a1d5e3953fc7836aee898e62101.zip
Merge pull request #4696 from richm/bug-1466152
Bug 1466152 - Json-file log driver: Neither "openshift_logging_fluentd_use_journal=false" nor omitted collects the log entries
Diffstat (limited to 'roles/openshift_logging/tasks')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 50698599a..5c5bbf84c 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -261,7 +261,6 @@
vars:
generated_certs_dir: "{{openshift.common.config_base}}/logging"
openshift_logging_fluentd_ops_host: "{{ ( openshift_logging_use_ops | bool ) | ternary('logging-es-ops', 'logging-es') }}"
- openshift_logging_fluentd_use_journal: "{{ openshift.docker.options | search('journald') }}"
openshift_logging_fluentd_image_prefix: "{{ openshift_logging_image_prefix }}"
openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version }}"
openshift_logging_fluentd_image_pull_secret: "{{ openshift_logging_image_pull_secret }}"