diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-05 16:12:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 16:12:46 -0400 |
| commit | 01f91dfe6257dc1df73df4e12ccd8db899369d27 (patch) | |
| tree | 830b5b42c0006a737b59c3f827bf821deb81238e | |
| parent | ca7c783ae18056a7d0b4dd0489e6ec4ac1d972d6 (diff) | |
| parent | e732ba81917f666388f76104778f2d3e1c67ab10 (diff) | |
| download | openshift-01f91dfe6257dc1df73df4e12ccd8db899369d27.tar.gz openshift-01f91dfe6257dc1df73df4e12ccd8db899369d27.tar.bz2 openshift-01f91dfe6257dc1df73df4e12ccd8db899369d27.tar.xz openshift-01f91dfe6257dc1df73df4e12ccd8db899369d27.zip | |
Merge pull request #4554 from richm/add-back-mux-client-config
add back mux_client config that was removed
| -rw-r--r-- | roles/openshift_logging_fluentd/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging_fluentd/templates/fluentd.j2 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_logging_fluentd/defaults/main.yml b/roles/openshift_logging_fluentd/defaults/main.yml index 228196d74..07f02804b 100644 --- a/roles/openshift_logging_fluentd/defaults/main.yml +++ b/roles/openshift_logging_fluentd/defaults/main.yml @@ -49,6 +49,7 @@ openshift_logging_fluentd_aggregating_strict: "no" openshift_logging_fluentd_aggregating_cert_path: none openshift_logging_fluentd_aggregating_key_path: none openshift_logging_fluentd_aggregating_passphrase: none +openshift_logging_use_mux_client: False ### Deprecating in 3.6 openshift_logging_fluentd_es_copy: false diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2 index d9814370f..4b87379f6 100644 --- a/roles/openshift_logging_fluentd/templates/fluentd.j2 +++ b/roles/openshift_logging_fluentd/templates/fluentd.j2 @@ -62,6 +62,11 @@ spec: - name: dockerdaemoncfg mountPath: /etc/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_fluentd_master_url }}" @@ -107,6 +112,8 @@ spec: resourceFieldRef: containerName: "{{ daemonset_container_name }}" resource: limits.memory + - name: "USE_MUX_CLIENT" + value: "{{ openshift_logging_use_mux_client | default('false') | lower }}" volumes: - name: runlogjournal hostPath: @@ -135,3 +142,8 @@ spec: - name: dockerdaemoncfg hostPath: path: /etc/docker +{% if openshift_logging_use_mux_client | bool %} + - name: muxcerts + secret: + secretName: logging-mux +{% endif %} |