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 /roles/openshift_logging/templates | |
| 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
Diffstat (limited to 'roles/openshift_logging/templates')
| -rw-r--r-- | roles/openshift_logging/templates/fluentd.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
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: |