summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/config.yml
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-22 13:56:32 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-22 13:56:32 -0500
commitdc8938e01202db0464e54becf4812c3191ce2d51 (patch)
tree92f0e209ea94c631f7b514886b1903ad99c41f99 /playbooks/common/openshift-cluster/config.yml
parent1f3876fe3a3fcc2f4b7e7235e8a44fd6a508b861 (diff)
parent7cdfdd7f23ede2898d0c68284a3f59c37292e9d3 (diff)
downloadopenshift-dc8938e01202db0464e54becf4812c3191ce2d51.tar.gz
openshift-dc8938e01202db0464e54becf4812c3191ce2d51.tar.bz2
openshift-dc8938e01202db0464e54becf4812c3191ce2d51.tar.xz
openshift-dc8938e01202db0464e54becf4812c3191ce2d51.zip
Merge pull request #1337 from abutcher/master-scaleup
Support for adding new masters
Diffstat (limited to 'playbooks/common/openshift-cluster/config.yml')
-rw-r--r--playbooks/common/openshift-cluster/config.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 2cad4b362..23c8f039e 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -11,4 +11,6 @@
- include: ../openshift-master/config.yml
+- include: additional_config.yml
+
- include: ../openshift-node/config.yml