summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-16 23:08:14 -0500
committerGitHub <noreply@github.com>2018-01-16 23:08:14 -0500
commitd5241bd08465db72d5a4c4c36d7c4a14f151d688 (patch)
treee78130d8b3e7d8c4e7df508334a57858402057f4 /roles/openshift_metrics/tasks
parent214595c511002fd40f8134231ddea4a8e1f9f563 (diff)
parentb498f10bf3e0c755dba6ce45913bd163475989fb (diff)
downloadopenshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.gz
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.bz2
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.xz
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.zip
Merge pull request #6730 from spadgett/console-config-api-changes
Update console config for API changes
Diffstat (limited to 'roles/openshift_metrics/tasks')
-rw-r--r--roles/openshift_metrics/tasks/install_metrics.yaml9
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml
index 0866fe0d2..4a63d081e 100644
--- a/roles/openshift_metrics/tasks/install_metrics.yaml
+++ b/roles/openshift_metrics/tasks/install_metrics.yaml
@@ -74,9 +74,14 @@
- name: Add metrics route information to web console asset config
include_role:
name: openshift_web_console
- tasks_from: update_asset_config.yml
+ tasks_from: update_console_config.yml
vars:
- asset_config_edits:
+ 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