summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-10 11:21:16 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-10 11:21:16 -0500
commitb10f66a2786161c79e68ba8f7e6f9b3a2caab76c (patch)
tree7e8d782d73cad3875edba603ed19c5e8ba5f6f44 /playbooks/common/openshift-master
parent493dba34b5100301366c550596be50e0b7d5a681 (diff)
parent9fc1e7ac3e066add840be7691a9647f6157afe27 (diff)
downloadopenshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.gz
openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.bz2
openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.tar.xz
openshift-b10f66a2786161c79e68ba8f7e6f9b3a2caab76c.zip
Merge pull request #1030 from jtslear/make-examples-optional
Make the install of openshift_examples optional
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index d6d6e1cf4..3151bf113 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -341,7 +341,8 @@
roles:
- role: openshift_master_cluster
when: openshift_master_ha | bool and openshift.master.cluster_method == "pacemaker"
- - openshift_examples
+ - role: openshift_examples
+ when: openshift.common.install_examples | bool
- role: openshift_cluster_metrics
when: openshift.common.use_cluster_metrics | bool
- role: openshift_manageiq