summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics
diff options
context:
space:
mode:
authorSamuel Padgett <spadgett@redhat.com>2018-01-17 09:00:07 -0500
committerSamuel Padgett <spadgett@redhat.com>2018-01-19 13:10:20 -0500
commitb74651d1495a13db5545609e62010ebc1e073379 (patch)
tree4942ec5cc92df9b287ac83b681c8bdd42f36199c /roles/openshift_metrics
parent7411bdcabfce83e21273d32c67e88925dfccd2df (diff)
downloadopenshift-b74651d1495a13db5545609e62010ebc1e073379.tar.gz
openshift-b74651d1495a13db5545609e62010ebc1e073379.tar.bz2
openshift-b74651d1495a13db5545609e62010ebc1e073379.tar.xz
openshift-b74651d1495a13db5545609e62010ebc1e073379.zip
Remove old console asset config
Stop writing deprecated config to the console config map.
Diffstat (limited to 'roles/openshift_metrics')
-rw-r--r--roles/openshift_metrics/tasks/install_metrics.yaml5
-rw-r--r--roles/openshift_metrics/tasks/uninstall_metrics.yaml2
2 files changed, 1 insertions, 6 deletions
diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml
index 4a63d081e..0dd5d1621 100644
--- a/roles/openshift_metrics/tasks/install_metrics.yaml
+++ b/roles/openshift_metrics/tasks/install_metrics.yaml
@@ -79,11 +79,6 @@
console_config_edits:
- key: clusterInfo#metricsPublicURL
value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics"
- # Continue to set the old deprecated property until the
- # origin-web-console image is updated for the new name.
- # This will be removed in a future pull.
- - key: metricsPublicURL
- value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics"
when: openshift_web_console_install | default(true) | bool
- command: >
diff --git a/roles/openshift_metrics/tasks/uninstall_metrics.yaml b/roles/openshift_metrics/tasks/uninstall_metrics.yaml
index 9fa0ad990..1664e9975 100644
--- a/roles/openshift_metrics/tasks/uninstall_metrics.yaml
+++ b/roles/openshift_metrics/tasks/uninstall_metrics.yaml
@@ -26,6 +26,6 @@
tasks_from: update_console_config.yml
vars:
console_config_edits:
- - key: metricsPublicURL
+ - key: clusterInfo#metricsPublicURL
value: ""
when: openshift_web_console_install | default(true) | bool