summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_mux
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_mux
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_mux')
-rw-r--r--roles/openshift_logging_mux/defaults/main.yml1
-rw-r--r--roles/openshift_logging_mux/templates/mux.j22
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"