From 9e770458d3c1f507b8ab60af40c4cb82c6ba3b84 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 31 Aug 2016 15:51:27 -0400 Subject: Remove openshift_master_metrics_public_url --- roles/openshift_master_facts/tasks/main.yml | 1 - roles/openshift_master_facts/vars/main.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/openshift_master_facts') 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 }}" -- cgit v1.2.1