diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-10 09:05:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 09:05:19 -0500 |
| commit | fb6e445d1c44e74c9cb769f6243b5bdd5b64374e (patch) | |
| tree | 077f4520869d484c0be9ba5b5b28f10c8584ba28 /roles/openshift_logging/templates | |
| parent | 9e92660ed86623385e48c4960f4db681d86a7a57 (diff) | |
| parent | 10b809ffa7edad6e21744c92fe744fc45073694a (diff) | |
| download | openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.gz openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.bz2 openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.tar.xz openshift-fb6e445d1c44e74c9cb769f6243b5bdd5b64374e.zip | |
Merge pull request #3281 from ewolinetz/revert_3257
Reverting commit 3257 and renaming master_url to openshift_logging_ma…
Diffstat (limited to 'roles/openshift_logging/templates')
| -rw-r--r-- | roles/openshift_logging/templates/curator.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/fluentd.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/kibana.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging/templates/curator.j2 b/roles/openshift_logging/templates/curator.j2 index de6258eaa..b7bc15b62 100644 --- a/roles/openshift_logging/templates/curator.j2 +++ b/roles/openshift_logging/templates/curator.j2 @@ -48,7 +48,7 @@ spec: env: - name: "K8S_HOST_URL" - value: "{{master_url}}" + value: "{{openshift_logging_master_url}}" - name: "ES_HOST" value: "{{es_host}}" diff --git a/roles/openshift_logging/templates/fluentd.j2 b/roles/openshift_logging/templates/fluentd.j2 index b6c91f8ed..223d342b9 100644 --- a/roles/openshift_logging/templates/fluentd.j2 +++ b/roles/openshift_logging/templates/fluentd.j2 @@ -61,7 +61,7 @@ spec: readOnly: true env: - name: "K8S_HOST_URL" - value: "{{master_url}}" + value: "{{openshift_logging_master_url}}" - name: "ES_HOST" value: "{{openshift_logging_es_host}}" - name: "ES_PORT" diff --git a/roles/openshift_logging/templates/kibana.j2 b/roles/openshift_logging/templates/kibana.j2 index 3a9e03768..be9b45ab4 100644 --- a/roles/openshift_logging/templates/kibana.j2 +++ b/roles/openshift_logging/templates/kibana.j2 @@ -90,7 +90,7 @@ spec: value: kibana-proxy - name: "OAP_MASTER_URL" - value: {{master_url}} + value: {{openshift_logging_master_url}} - name: "OAP_PUBLIC_MASTER_URL" value: {{openshift_logging_master_public_url}} |