summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-31 16:54:59 -0400
committerGitHub <noreply@github.com>2016-08-31 16:54:59 -0400
commit323ac4e6e5be0cec8fe3ecef8df475c508b7975c (patch)
treeff07f294956f5bb992059c08eb1505c6f4e8d41c /roles/openshift_master_facts
parenta70ac179e1a070aa525c8b596746fb0379abd474 (diff)
parent9e770458d3c1f507b8ab60af40c4cb82c6ba3b84 (diff)
downloadopenshift-323ac4e6e5be0cec8fe3ecef8df475c508b7975c.tar.gz
openshift-323ac4e6e5be0cec8fe3ecef8df475c508b7975c.tar.bz2
openshift-323ac4e6e5be0cec8fe3ecef8df475c508b7975c.tar.xz
openshift-323ac4e6e5be0cec8fe3ecef8df475c508b7975c.zip
Merge pull request #2393 from abutcher/metrics-public-url
Remove openshift_master_metrics_public_url
Diffstat (limited to 'roles/openshift_master_facts')
-rw-r--r--roles/openshift_master_facts/tasks/main.yml1
-rw-r--r--roles/openshift_master_facts/vars/main.yml2
2 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index 701460bb7..e0c0fc644 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -17,7 +17,6 @@
console_use_ssl: "{{ openshift_master_console_use_ssl | default(None) }}"
public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
logging_public_url: "{{ openshift_master_logging_public_url | default(None) }}"
- metrics_public_url: "{{ openshift_master_metrics_public_url | default(None) }}"
logout_url: "{{ openshift_master_logout_url | default(None) }}"
extension_scripts: "{{ openshift_master_extension_scripts | default(None) }}"
extension_stylesheets: "{{ openshift_master_extension_stylesheets | default(None) }}"
diff --git a/roles/openshift_master_facts/vars/main.yml b/roles/openshift_master_facts/vars/main.yml
index 0646004b3..406d50c24 100644
--- a/roles/openshift_master_facts/vars/main.yml
+++ b/roles/openshift_master_facts/vars/main.yml
@@ -19,7 +19,7 @@ builddefaults_yaml:
- name: no_proxy
value: "{{ openshift.master.builddefaults_no_proxy | default(omit, true) | join(',') }}"
-metrics_hostname: "{{ openshift.hosted.metrics.public_url
+metrics_hostname: "{{ openshift_hosted_metrics_public_url
| default('hawkular-metrics.' ~ (openshift.master.default_subdomain
| default(openshift_master_default_subdomain )))
| oo_hostname_from_url }}"