Pulling in changes from master

1 files changed, 7 insertions, 7 deletions

diff --git a/roles/openshift_logging_fluentd/templates/fluentd.j2 b/roles/openshift_logging_fluentd/templates/fluentd.j2
index 336d657d5..8e079120d 100644
--- a/roles/openshift_logging_fluentd/templates/fluentd.j2
+++ b/roles/openshift_logging_fluentd/templates/fluentd.j2
@@ -61,27 +61,27 @@ spec:
           readOnly: true
         env:
         - name: "K8S_HOST_URL"
-          value: "{{ openshift_logging_master_url }}"
+          value: "{{ openshift_logging_fluentd_master_url }}"
         - name: "ES_HOST"
           value: "{{ app_host }}"
         - name: "ES_PORT"
           value: "{{ app_port }}"
         - name: "ES_CLIENT_CERT"
-          value: "{{ openshift_logging_es_client_cert }}"
+          value: "{{ openshift_logging_fluentd_app_client_cert }}"
         - name: "ES_CLIENT_KEY"
-          value: "{{ openshift_logging_es_client_key }}"
+          value: "{{ openshift_logging_fluentd_app_client_key }}"
         - name: "ES_CA"
-          value: "{{ openshift_logging_es_ca }}"
+          value: "{{ openshift_logging_fluentd_app_ca }}"
         - name: "OPS_HOST"
           value: "{{ ops_host }}"
         - name: "OPS_PORT"
           value: "{{ ops_port }}"
         - name: "OPS_CLIENT_CERT"
-          value: "{{ openshift_logging_es_ops_client_cert }}"
+          value: "{{ openshift_logging_fluentd_ops_client_cert }}"
         - name: "OPS_CLIENT_KEY"
-          value: "{{ openshift_logging_es_ops_client_key }}"
+          value: "{{ openshift_logging_fluentd_ops_client_key }}"
         - name: "OPS_CA"
-          value: "{{ openshift_logging_es_ops_ca }}"
+          value: "{{ openshift_logging_fluentd_ops_ca }}"
         - name: "ES_COPY"
           value: "false"
         - name: "USE_JOURNAL"