Remove openshift_master_metrics_public_url

inventory/byo/hosts.origin.example

@@ -363,7 +363,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #
 # Override metricsPublicURL in the master config for cluster metrics
 # Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics
-#openshift_master_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics
+#openshift_hosted_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics
 
 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet')
 # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant'

inventory/byo/hosts.ose.example

@@ -362,7 +362,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #
 # Override metricsPublicURL in the master config for cluster metrics
 # Defaults to https://hawkular-metrics.{{openshift_master_default_subdomain}}/hawkular/metrics
-#openshift_master_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics
+#openshift_hosted_metrics_public_url=https://hawkular-metrics.example.com/hawkular/metrics
 
 
 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet')

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) }}"

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 }}"

roles/openshift_metrics/tasks/main.yaml

@@ -1,7 +1,7 @@
 ---
 - fail:
-    msg: This role required openshift_master_default_subdomain or openshift_master_metrics_url be set
-  when: openshift.master.metrics_public_url | default(openshift_master_metrics_public_url | default(openshift.master.default_subdomain | default(openshift_master_default_subdomain | default(none)))) is none
+    msg: This role required openshift_master_default_subdomain or openshift_hosted_metrics_public_url be set
+  when: openshift.master.metrics_public_url | default(openshift_hosted_metrics_public_url | default(openshift.master.default_subdomain | default(openshift_master_default_subdomain | default(none)))) is none
 
 - name: Create temp directory for kubeconfig
   command: mktemp -d /tmp/openshift-ansible-XXXXXX