diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-08 12:55:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 12:55:41 -0500 |
| commit | 16749761a312894d8ba1101917b7ebf430616812 (patch) | |
| tree | 1cccc66e87939cb8faccad8ba197d1a54fc2c38e /playbooks/common/openshift-cluster | |
| parent | 09b3183997a65c2835a95cf8c38c28e3f20380a7 (diff) | |
| parent | 7e8e98dad2adde361c7ecc6e7b043429bed6d77a (diff) | |
| download | openshift-16749761a312894d8ba1101917b7ebf430616812.tar.gz openshift-16749761a312894d8ba1101917b7ebf430616812.tar.bz2 openshift-16749761a312894d8ba1101917b7ebf430616812.tar.xz openshift-16749761a312894d8ba1101917b7ebf430616812.zip | |
Merge pull request #2902 from dgoodwin/fix-metrics-url
Fix metricsPublicURL only being set correctly on first master.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -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 ccbba54b4..cd2f2e6aa 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 | 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_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) }}" |