summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
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 /playbooks/common/openshift-cluster
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 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/openshift_hosted.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml
index 06cda36a5..5db71b857 100644
--- a/playbooks/common/openshift-cluster/openshift_hosted.yml
+++ b/playbooks/common/openshift-cluster/openshift_hosted.yml
@@ -53,6 +53,8 @@
pre_tasks:
- set_fact:
openshift_logging_kibana_hostname: "{{ openshift_hosted_logging_hostname | default('kibana.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
+ - set_fact:
+ openshift_metrics_hawkular_hostname: "{{ g_metrics_hostname | default('hawkular-metrics.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true))) }}"
tasks:
- block:
@@ -60,3 +62,9 @@
name: openshift_logging
tasks_from: update_master_config
when: openshift_hosted_logging_deploy | default(false) | bool
+
+ - block:
+ - include_role:
+ name: openshift_metrics
+ tasks_from: update_master_config
+ when: openshift_hosted_metrics_deploy | default(false) | bool