diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-10 17:49:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 17:49:04 -0400 |
| commit | 34134d59d9b5b107682a5ba11d5891e3830d219a (patch) | |
| tree | 89afa2e944a0917f454279d8438a16edfb2dae96 | |
| parent | 3a8f805e134848c4dbf24315f3f0b5b48c00721e (diff) | |
| parent | 02a5df1c54c501ebd525b9337c5a3ade04fe31e4 (diff) | |
| download | openshift-34134d59d9b5b107682a5ba11d5891e3830d219a.tar.gz openshift-34134d59d9b5b107682a5ba11d5891e3830d219a.tar.bz2 openshift-34134d59d9b5b107682a5ba11d5891e3830d219a.tar.xz openshift-34134d59d9b5b107682a5ba11d5891e3830d219a.zip | |
Merge pull request #4136 from richm/find-log-driver
use docker_log_driver and /etc/docker/daemon.json to determine log driver
| -rw-r--r-- | roles/openshift_logging/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/fluentd.j2 | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml index c05cc5f98..76dfe518e 100644 --- a/roles/openshift_logging/defaults/main.yml +++ b/roles/openshift_logging/defaults/main.yml @@ -72,7 +72,7 @@ openshift_logging_fluentd_nodeselector: "{{ openshift_hosted_logging_fluentd_nod openshift_logging_fluentd_cpu_limit: 100m openshift_logging_fluentd_memory_limit: 512Mi openshift_logging_fluentd_es_copy: false -openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal | default('') }}" +openshift_logging_fluentd_use_journal: "{{ openshift_hosted_logging_use_journal if openshift_hosted_logging_use_journal is defined else (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) }}" openshift_logging_fluentd_journal_source: "{{ openshift_hosted_logging_journal_source | default('') }}" openshift_logging_fluentd_journal_read_from_head: "{{ openshift_hosted_logging_journal_read_from_head | default('') }}" openshift_logging_fluentd_hosts: ['--all'] diff --git a/roles/openshift_logging/templates/fluentd.j2 b/roles/openshift_logging/templates/fluentd.j2 index d13691259..5c93d823e 100644 --- a/roles/openshift_logging/templates/fluentd.j2 +++ b/roles/openshift_logging/templates/fluentd.j2 @@ -59,6 +59,9 @@ spec: - name: dockercfg mountPath: /etc/sysconfig/docker readOnly: true + - name: dockerdaemoncfg + mountPath: /etc/docker + readOnly: true {% if openshift_logging_use_mux_client | bool %} - name: muxcerts mountPath: /etc/fluent/muxkeys @@ -154,6 +157,9 @@ spec: - name: dockercfg hostPath: path: /etc/sysconfig/docker + - name: dockerdaemoncfg + hostPath: + path: /etc/docker {% if openshift_logging_use_mux_client | bool %} - name: muxcerts secret: |