diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-23 14:35:50 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-09-26 13:58:51 -0400 |
| commit | d30f7a97300a719a9c48b3c3386a9bc8301b38d2 (patch) | |
| tree | da94c5777892b728a9fcf3bfc8c9db600fda30d2 | |
| parent | 2f9779e834387dc3fef061ce6909b5f8a2e9f614 (diff) | |
| download | openshift-d30f7a97300a719a9c48b3c3386a9bc8301b38d2.tar.gz openshift-d30f7a97300a719a9c48b3c3386a9bc8301b38d2.tar.bz2 openshift-d30f7a97300a719a9c48b3c3386a9bc8301b38d2.tar.xz openshift-d30f7a97300a719a9c48b3c3386a9bc8301b38d2.zip | |
Set default_subdomain properly for logging
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index 207c51dca..01c7cd795 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -20,8 +20,8 @@ openshift_hosted_registry_registryurl: "{{ hostvars[groups.oo_first_master.0].openshift.master.registry_url }}" when: "'master' in hostvars[groups.oo_first_master.0].openshift and 'registry_url' in hostvars[groups.oo_first_master.0].openshift.master" - set_fact: - logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ openshift_master_default_subdomain) }}" - logging_ops_hostname: "{{ openshift_hosted_logging_ops_hostname | default('kibana-ops.' ~ openshift_master_default_subdomain) }}" + logging_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift.master.default_subdomain | default('router.default.svc.cluster.local', true))) }}" + logging_ops_hostname: "{{ openshift_hosted_logging_ops_hostname | default('kibana-ops.' ~ (openshift.master.default_subdomain | default('router.default.svc.cluster.local', true))) }}" logging_master_public_url: "{{ openshift_hosted_logging_master_public_url | default(openshift.master.public_api_url) }}" logging_elasticsearch_cluster_size: "{{ openshift_hosted_logging_elasticsearch_cluster_size | default(1) }}" logging_elasticsearch_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}" |