summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-06 16:26:29 -0500
committerGitHub <noreply@github.com>2017-02-06 16:26:29 -0500
commit41ff6013a19c77fdc35adcf58ad523069f20ee2f (patch)
tree5e111d8651ac4bbf8ed979ee90c973ae6496f056 /roles/openshift_logging/templates
parent5c40085f671cd1c0d21303304be7346e91a54248 (diff)
parentb53e69588296800998f2256d66a74080ebc1e4f1 (diff)
downloadopenshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.gz
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.bz2
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.tar.xz
openshift-41ff6013a19c77fdc35adcf58ad523069f20ee2f.zip
Merge pull request #3257 from jcantrill/bz1417261_deployer_with_35
fixes 1417261. Points playbooks to the correct 3.5 roles for logging …
Diffstat (limited to 'roles/openshift_logging/templates')
-rw-r--r--roles/openshift_logging/templates/kibana.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/templates/kibana.j2 b/roles/openshift_logging/templates/kibana.j2
index b42f62850..3a9e03768 100644
--- a/roles/openshift_logging/templates/kibana.j2
+++ b/roles/openshift_logging/templates/kibana.j2
@@ -93,10 +93,10 @@ spec:
value: {{master_url}}
-
name: "OAP_PUBLIC_MASTER_URL"
- value: {{public_master_url}}
+ value: {{openshift_logging_master_public_url}}
-
name: "OAP_LOGOUT_REDIRECT"
- value: {{public_master_url}}/console/logout
+ value: {{openshift_logging_master_public_url}}/console/logout
-
name: "OAP_MASTER_CA_FILE"
value: "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"