diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2017-06-22 18:58:55 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2017-07-05 07:50:21 -0600 |
| commit | e732ba81917f666388f76104778f2d3e1c67ab10 (patch) | |
| tree | 07f01ab858caf5525b5eb4895b1df850cafcec18 | |
| parent | b7104cf8e01f94f9029a0808eb9eb2c6cb6107b2 (diff) | |
| download | openshift-e732ba81917f666388f76104778f2d3e1c67ab10.tar.gz openshift-e732ba81917f666388f76104778f2d3e1c67ab10.tar.bz2 openshift-e732ba81917f666388f76104778f2d3e1c67ab10.tar.xz openshift-e732ba81917f666388f76104778f2d3e1c67ab10.zip | |
add back mux_client config that was removed
not sure how this got removed, during the rebase of the logging
roles perhaps?
Also ensure that the value used in the fluentd daemonset env var is
lower cased to work with the fluentd/run.sh script.
| -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 %} |