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_mux | |
| 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_mux')
| -rw-r--r-- | roles/openshift_logging_mux/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging_mux/templates/mux.j2 | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/roles/openshift_logging_mux/defaults/main.yml b/roles/openshift_logging_mux/defaults/main.yml index 77e47d38c..797a27c1b 100644 --- a/roles/openshift_logging_mux/defaults/main.yml +++ b/roles/openshift_logging_mux/defaults/main.yml @@ -24,7 +24,6 @@ openshift_logging_mux_ops_host: "{{ openshift_logging_mux_app_host }}" openshift_logging_mux_ops_port: "{{ openshift_logging_mux_app_port }}" ### Used by "hosted" and "secure-aggregator" deployments -openshift_logging_mux_use_journal: "{{ openshift_hosted_logging_use_journal | default('') }}" openshift_logging_mux_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}" openshift_logging_mux_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2 index c3f9b3433..226294847 100644 --- a/roles/openshift_logging_mux/templates/mux.j2 +++ b/roles/openshift_logging_mux/templates/mux.j2 @@ -89,8 +89,6 @@ spec: value: "{{openshift_logging_mux_ops_client_key}}" - name: "OPS_CA" value: "{{openshift_logging_mux_ops_ca}}" - - name: "USE_JOURNAL" - value: "false" - name: "JOURNAL_SOURCE" value: "{{openshift_logging_mux_journal_source | default('')}}" - name: "JOURNAL_READ_FROM_HEAD" |