summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-09-13 14:50:32 -0400
committerRussell Teague <rteague@redhat.com>2017-09-13 14:50:32 -0400
commita96463d1402599b006272b2fbd8312ba55f302ed (patch)
treeff6a9c8c06151755b55773b3a5a23ef3458c42ea
parentd17fe01a857fb7d5b6e7055a96e0cb2cab852857 (diff)
downloadopenshift-a96463d1402599b006272b2fbd8312ba55f302ed.zip
openshift-a96463d1402599b006272b2fbd8312ba55f302ed.tar.gz
openshift-a96463d1402599b006272b2fbd8312ba55f302ed.tar.bz2
openshift-a96463d1402599b006272b2fbd8312ba55f302ed.tar.xz
Rework openshift-cluster into deploy_cluster.yml
-rw-r--r--docs/proposals/playbook_consolidation.md35
1 files changed, 15 insertions, 20 deletions
diff --git a/docs/proposals/playbook_consolidation.md b/docs/proposals/playbook_consolidation.md
index aa5709c..98aedb0 100644
--- a/docs/proposals/playbook_consolidation.md
+++ b/docs/proposals/playbook_consolidation.md
@@ -125,37 +125,32 @@ openshift-ansible/playbooks/openshift-master
- include: private/config.yml
```
-The following examples shows how multiple components would be combined to
-perform a complete install.
+With the consolidation of the directory structure and component installs being
+removed from `openshift-cluster`, that directory is no longer necessary. To
+deploy an entire OpenShift cluster, a playbook would be created to tie together
+all of the different components. The following example shows how multiple
+components would be combined to perform a complete install.
```yaml
-# openshift-ansible/playbooks/openshift-cluster/config.yml
+# openshift-ansible/playbooks/deploy_cluster.yml
---
-- include: ../init/main.yml
-
-- include: private/config.yml
-```
+- include: init/main.yml
-```yaml
-# openshift-ansible/playbooks/openshift-cluster/private/config.yml
----
-- include: ../../openshift-etcd/private/config.yml
+- include: openshift-etcd/private/config.yml
-- include: ../../openshift-nfs/private/config.yml
+- include: openshift-nfs/private/config.yml
-- include: ../../openshift-loadbalancer/private/config.yml
+- include: openshift-loadbalancer/private/config.yml
-- include: ../../openshift-master/private/config.yml
+- include: openshift-master/private/config.yml
-- include: ../../openshift-node/private/config.yml
+- include: openshift-node/private/config.yml
-- include: ../../openshift-glusterfs/private/config.yml
+- include: openshift-glusterfs/private/config.yml
-- include: openshift_hosted.yml
+- include: openshift-hosted/private/config.yml
-- include: service_catalog.yml
- when:
- - openshift_enable_service_catalog | default(false) | bool
+- include: openshift-service-catalog/private/config.yml
```
## User Story