diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-20 20:56:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 20:56:02 -0800 |
| commit | b1f728d464e8ac4b80462b3dbaa87c631430368b (patch) | |
| tree | 677da0d5bd16409a64816666688dbcfcb8cb9d53 /roles/openshift_metrics/tasks | |
| parent | d5a464bddf793e64a2c3937f61b109e0f801e6b5 (diff) | |
| parent | b74651d1495a13db5545609e62010ebc1e073379 (diff) | |
| download | openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.gz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.bz2 openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.xz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.zip | |
Merge pull request #6754 from spadgett/remove-old-console-config
Automatic merge from submit-queue.
Remove obsolete properties from console config map
Stop writing deprecated config to the console config map.
/hold
This can't be merged until https://github.com/openshift/origin-web-console-server/pull/20 merges.
Follow on to https://github.com/openshift/openshift-ansible/pull/6730
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_metrics.yaml | 5 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/uninstall_metrics.yaml | 2 |
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 |