Merge pull request openshift#11168 from openshift-cherrypick-robot/ch…

…erry-pick-11165-to-release-3.9 [release-3.9] bug 1668338. Fix the correct ds template
rjhowe · Feb 11, 2019 · 21cd6fe · 21cd6fe
2 parents 1cf87a6 + 4e8b319
commit 21cd6fe
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/roles/openshift_logging_fluentd/templates/2.x/fluentd.j2 b/roles/openshift_logging_fluentd/templates/2.x/fluentd.j2
@@ -92,6 +92,8 @@ spec:
           readOnly: true
 {% endif %}
         env:
+        - name: "MERGE_JSON_LOG"
+          value: "{{ openshift_logging_fluentd_merge_json_log }}"
         - name: "K8S_HOST_URL"
           value: "{{ openshift_logging_fluentd_master_url }}"
         - name: "ES_HOST"