diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-12-01 12:37:20 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-12-01 12:37:20 -0400 |
| commit | 7e8e98dad2adde361c7ecc6e7b043429bed6d77a (patch) | |
| tree | 9a193f72094d77fae4369ec2a31f714c58e11a9f /roles/openshift_master_facts/vars | |
| parent | 4ff3ae5f8e99145a06a0cc9976ec07c008831b65 (diff) | |
| download | openshift-7e8e98dad2adde361c7ecc6e7b043429bed6d77a.tar.gz openshift-7e8e98dad2adde361c7ecc6e7b043429bed6d77a.tar.bz2 openshift-7e8e98dad2adde361c7ecc6e7b043429bed6d77a.tar.xz openshift-7e8e98dad2adde361c7ecc6e7b043429bed6d77a.zip | |
Fix metricsPublicURL only being set correctly on first master.
Problem was caused by facts not being set for that master. To fix this
patch cleans up the calculation of metricsPublicURL in general. Because
this value is used in openshift_master to template into the master
config file, we now define these facts more clearly in
openshift_master_facts, and add a dependency on this to
openshift_metrics.
The calculation of default sub-domain is also changed to remove it from
system facts (as neither of these are facts about the system) and
instead use plain variables.
Diffstat (limited to 'roles/openshift_master_facts/vars')
| -rw-r--r-- | roles/openshift_master_facts/vars/main.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/roles/openshift_master_facts/vars/main.yml b/roles/openshift_master_facts/vars/main.yml index 3f328dcfe..a5ad580e7 100644 --- a/roles/openshift_master_facts/vars/main.yml +++ b/roles/openshift_master_facts/vars/main.yml @@ -24,7 +24,3 @@ builddefaults_yaml: - name: no_proxy value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}" -metrics_hostname: "{{ openshift_hosted_metrics_public_url - | default('hawkular-metrics.' ~ (openshift.master.default_subdomain - | default(openshift_master_default_subdomain ))) - | oo_hostname_from_url }}" |