summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-27 13:41:16 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-27 13:41:16 -0300
commitd54665d0c0c1f7a3cec572c04f3ce769277c05e4 (patch)
tree043628b7a804ad66019129129cc0186289d80a28 /playbooks/common
parent055921cd545c12733949f37c1af2c0a1296216ec (diff)
parent5c7e1366ad8ae67ef23117d296a65a6ee81ccd29 (diff)
downloadopenshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.gz
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.bz2
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.tar.xz
openshift-d54665d0c0c1f7a3cec572c04f3ce769277c05e4.zip
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 904ad2dab..acf85fc04 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -215,6 +215,8 @@
- role: openshift_master_cluster
when: openshift_master_ha | bool
- openshift_examples
+ - role: openshift_cluster_metrics
+ when: openshift.common.use_cluster_metrics | bool
# Additional instance config for online deployments
- name: Additional instance config