summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/tasks
diff options
context:
space:
mode:
authorOpenShift Bot <dmcphers+openshiftbot@redhat.com>2017-03-11 10:04:27 -0500
committerGitHub <noreply@github.com>2017-03-11 10:04:27 -0500
commit608b6debb28d9b477d21cd78f01d0bfbcd04cd01 (patch)
treef7541e860427a1fc21b16c1f78daa25d838d13a3 /roles/openshift_metrics/tasks
parent15100f21a5b60271223d32b41de986ff6c0b3e0f (diff)
parentb70ccecac5ee1593754d4034c23feb58302e2bde (diff)
downloadopenshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.gz
openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.bz2
openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.tar.xz
openshift-608b6debb28d9b477d21cd78f01d0bfbcd04cd01.zip
Merge pull request #3625 from jcantrill/bz1430661_update_metrics_url
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_metrics/tasks')
-rw-r--r--roles/openshift_metrics/tasks/install_metrics.yaml2
-rw-r--r--roles/openshift_metrics/tasks/update_master_config.yaml9
2 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_metrics/tasks/install_metrics.yaml b/roles/openshift_metrics/tasks/install_metrics.yaml
index 66a3abdbd..ffe6f63a2 100644
--- a/roles/openshift_metrics/tasks/install_metrics.yaml
+++ b/roles/openshift_metrics/tasks/install_metrics.yaml
@@ -34,6 +34,8 @@
file_content: "{{ item.content | b64decode | from_yaml }}"
with_items: "{{ object_defs.results }}"
+- include: update_master_config.yaml
+
- command: >
{{openshift.common.client_binary}}
--config={{mktemp.stdout}}/admin.kubeconfig
diff --git a/roles/openshift_metrics/tasks/update_master_config.yaml b/roles/openshift_metrics/tasks/update_master_config.yaml
new file mode 100644
index 000000000..20fc45fd4
--- /dev/null
+++ b/roles/openshift_metrics/tasks/update_master_config.yaml
@@ -0,0 +1,9 @@
+---
+- name: Adding metrics route information to metricsPublicURL
+ modify_yaml:
+ dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
+ yaml_key: assetConfig.metricsPublicURL
+ yaml_value: "https://{{ openshift_metrics_hawkular_hostname}}/hawkular/metrics"
+ notify: restart master
+ tags:
+ - update_master_config