diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-02 03:58:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 03:58:02 -0400 |
| commit | beb5deaedb105acd113807597858069a38553952 (patch) | |
| tree | d2c08851aaa3a332d9f5acc1f7384c91224662d7 /roles/openshift_logging_fluentd/templates/fluentd.j2 | |
| parent | 4b8e77af233a13eef17aaab13a0f0ff06cb423f4 (diff) | |
| parent | ace4a6cf7c5f9e3abea46a1811d04f4d5a03505f (diff) | |
| download | openshift-beb5deaedb105acd113807597858069a38553952.tar.gz openshift-beb5deaedb105acd113807597858069a38553952.tar.bz2 openshift-beb5deaedb105acd113807597858069a38553952.tar.xz openshift-beb5deaedb105acd113807597858069a38553952.zip | |
Merge pull request #4916 from richm/mux-client-mode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging_fluentd/templates/fluentd.j2')
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index a4cf9a149..39dffba19 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -64,7 +64,7 @@ spec: readOnly: true - name: filebufferstorage mountPath: /var/lib/fluentd -{% if openshift_logging_use_mux_client | bool %} +{% if openshift_logging_mux_client_mode is defined %} - name: muxcerts mountPath: /etc/fluent/muxkeys readOnly: true @@ -112,10 +112,12 @@ spec: resourceFieldRef: containerName: "{{ daemonset_container_name }}" resource: limits.memory - - name: "USE_MUX_CLIENT" - value: "{{ openshift_logging_use_mux_client | default('false') | lower }}" - name: "FILE_BUFFER_LIMIT" value: "{{ openshift_logging_fluentd_file_buffer_limit | default('1Gi') }}" +{% if openshift_logging_mux_client_mode is defined %} + - name: "MUX_CLIENT_MODE" + value: "{{ openshift_logging_mux_client_mode }}" +{% endif %} volumes: - name: runlogjournal hostPath: @@ -144,7 +146,7 @@ spec: - name: dockerdaemoncfg hostPath: path: /etc/docker -{% if openshift_logging_use_mux_client | bool %} +{% if openshift_logging_mux_client_mode is defined %} - name: muxcerts secret: secretName: logging-mux |