summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-20 11:58:45 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-20 11:58:45 -0400
commitc64590a63e64c6edad86766fbac5bf00b176b7c4 (patch)
tree3592a0a4141b64878b89989223b4b4e0dfbf5233 /playbooks/common
parentafff74593f6de2492e3ed1cbe63f68a2dfb732f3 (diff)
parent55e36e376858d023203f4a3d7884c830109bc122 (diff)
downloadopenshift-c64590a63e64c6edad86766fbac5bf00b176b7c4.tar.gz
openshift-c64590a63e64c6edad86766fbac5bf00b176b7c4.tar.bz2
openshift-c64590a63e64c6edad86766fbac5bf00b176b7c4.tar.xz
openshift-c64590a63e64c6edad86766fbac5bf00b176b7c4.zip
Merge pull request #1582 from jdnieto/openshift_metrics
added new openshift-metrics service
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/additional_config.yml2
-rw-r--r--playbooks/common/openshift-master/config.yml8
2 files changed, 10 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/additional_config.yml b/playbooks/common/openshift-cluster/additional_config.yml
index 44bf962c9..c5a0f123c 100644
--- a/playbooks/common/openshift-cluster/additional_config.yml
+++ b/playbooks/common/openshift-cluster/additional_config.yml
@@ -52,3 +52,5 @@
- role: openshift_registry
registry_volume_claim: "{{ openshift.hosted.registry.storage.volume.name }}-claim"
when: deploy_infra | bool and attach_registry_volume | bool
+ - role: openshift_metrics
+ when: openshift.hosted.metrics.deploy | bool
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 620c4ea7c..e271b4964 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -35,6 +35,14 @@
- set_fact:
openshift_master_debug_level: "{{ t_oo_option_master_debug_level }}"
when: openshift_master_debug_level is not defined and t_oo_option_master_debug_level != ""
+
+ - set_fact:
+ openshift_master_default_subdomain: "{{ lookup('oo_option', 'openshift_master_default_subdomain') | default(None) }}"
+ when: openshift_master_default_subdomain is not defined
+ - set_fact:
+ openshift_hosted_metrics_deploy: "{{ lookup('oo_option', 'openshift_hosted_metrics_deploy') | default(false, true) }}"
+ when: openshift_hosted_metrics_deploy is not defined
+
roles:
- openshift_facts
post_tasks: