diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-24 20:36:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 20:36:58 -0500 |
| commit | db492e0e8458006c8b2f67025198b8456ee88a84 (patch) | |
| tree | ed77d74025232010b3227551392696b483454ed8 /roles/openshift_logging/templates/fluentd.j2 | |
| parent | 080fd457230028d3515f3cee361f016fdeab1573 (diff) | |
| parent | 8e9453047b317c3723a5bcf6e5901aaa783f5f43 (diff) | |
| download | openshift-db492e0e8458006c8b2f67025198b8456ee88a84.tar.gz openshift-db492e0e8458006c8b2f67025198b8456ee88a84.tar.bz2 openshift-db492e0e8458006c8b2f67025198b8456ee88a84.tar.xz openshift-db492e0e8458006c8b2f67025198b8456ee88a84.zip | |
Merge pull request #3932 from richm/mux
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/templates/fluentd.j2')
| -rw-r--r-- | roles/openshift_logging/templates/fluentd.j2 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/roles/openshift_logging/templates/fluentd.j2 b/roles/openshift_logging/templates/fluentd.j2 index 0bf1686ad..d13691259 100644 --- a/roles/openshift_logging/templates/fluentd.j2 +++ b/roles/openshift_logging/templates/fluentd.j2 @@ -59,6 +59,11 @@ spec: - name: dockercfg mountPath: /etc/sysconfig/docker readOnly: true +{% if openshift_logging_use_mux_client | bool %} + - name: muxcerts + mountPath: /etc/fluent/muxkeys + readOnly: true +{% endif %} env: - name: "K8S_HOST_URL" value: "{{openshift_logging_master_url}}" @@ -122,6 +127,8 @@ spec: value: "{{openshift_logging_fluentd_journal_source | default('')}}" - name: "JOURNAL_READ_FROM_HEAD" value: "{{openshift_logging_fluentd_journal_read_from_head|lower}}" + - name: "USE_MUX_CLIENT" + value: "{{openshift_logging_use_mux_client| default('false')}}" volumes: - name: runlogjournal hostPath: @@ -147,3 +154,8 @@ spec: - name: dockercfg hostPath: path: /etc/sysconfig/docker +{% if openshift_logging_use_mux_client | bool %} + - name: muxcerts + secret: + secretName: logging-mux +{% endif %} |