summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-21 16:49:38 -0400
committerGitHub <noreply@github.com>2017-07-21 16:49:38 -0400
commit2a706ad80a4286afc4fe5a1cc0cadab302bc7291 (patch)
tree62d1190f1a47fd8b3b240bffd837501432aefe02
parent87689f890bb6d015f6c07e227174dc7c4172766e (diff)
parent7b4f98f67fce9215812e8503ad7d95cb4dcb6106 (diff)
downloadopenshift-2a706ad80a4286afc4fe5a1cc0cadab302bc7291.tar.gz
openshift-2a706ad80a4286afc4fe5a1cc0cadab302bc7291.tar.bz2
openshift-2a706ad80a4286afc4fe5a1cc0cadab302bc7291.tar.xz
openshift-2a706ad80a4286afc4fe5a1cc0cadab302bc7291.zip
Merge pull request #4828 from ewolinetz/bz1472222
Updating openshift_logging_kibana default for kibana hostname
-rw-r--r--roles/openshift_logging_kibana/defaults/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_logging_kibana/defaults/main.yml b/roles/openshift_logging_kibana/defaults/main.yml
index 23337bcd2..b2556fd71 100644
--- a/roles/openshift_logging_kibana/defaults/main.yml
+++ b/roles/openshift_logging_kibana/defaults/main.yml
@@ -11,7 +11,7 @@ openshift_logging_kibana_nodeselector: ""
openshift_logging_kibana_cpu_limit: null
openshift_logging_kibana_memory_limit: 736Mi
-openshift_logging_kibana_hostname: "kibana.router.default.svc.cluster.local"
+openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
openshift_logging_kibana_es_host: "logging-es"
openshift_logging_kibana_es_port: 9200