summaryrefslogtreecommitdiffstats
path: root/playbooks/byo/config.yml
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
committerJhon Honce <jhonce@redhat.com>2015-04-07 09:32:46 -0700
commit675f6165a83b86c1a498c327161f928d218ee244 (patch)
tree0ad271a03feac6bde2a296e6011498cd6455fa99 /playbooks/byo/config.yml
parent59e69dd21c19bf745392b5e83bd652630ee870cc (diff)
parent8a4888ad30ce7c5898caac47614da2e13a759320 (diff)
downloadopenshift-675f6165a83b86c1a498c327161f928d218ee244.tar.gz
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.bz2
openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.xz
openshift-675f6165a83b86c1a498c327161f928d218ee244.zip
Merge pull request #121 from detiber/nodeRegistrationChangesMaster
Node registration changes master
Diffstat (limited to 'playbooks/byo/config.yml')
-rw-r--r--playbooks/byo/config.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml
new file mode 100644
index 000000000..dce49d32f
--- /dev/null
+++ b/playbooks/byo/config.yml
@@ -0,0 +1,6 @@
+---
+- name: Run the openshift-master config playbook
+ include: openshift-master/config.yml
+
+- name: Run the openshift-node config playbook
+ include: openshift-node/config.yml