Cleanup byo references

23 files changed, 119 insertions, 132 deletions

diff --git a/.papr.sh b/.papr.sh
index 80453d4b2..c7b06f059 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -35,7 +35,7 @@ trap upload_journals ERR
 # run the actual installer
 # FIXME: override openshift_image_tag defined in the inventory until
 # https://github.com/openshift/openshift-ansible/issues/4478 is fixed.
-ansible-playbook -vvv -i .papr.inventory playbooks/byo/config.yml -e "openshift_image_tag=$OPENSHIFT_IMAGE_TAG"
+ansible-playbook -vvv -i .papr.inventory playbooks/deploy_cluster.yml -e "openshift_image_tag=$OPENSHIFT_IMAGE_TAG"
 
 ### DISABLING TESTS FOR NOW, SEE:
 ### https://github.com/openshift/openshift-ansible/pull/6132
diff --git a/ansible.cfg b/ansible.cfg
index 9900d28f8..e4d72553e 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -30,8 +30,8 @@ inventory_ignore_extensions = secrets.py, .pyc, .cfg, .crt
 # work around privilege escalation timeouts in ansible:
 timeout = 30
 
-# Uncomment to use the provided BYO inventory
-#inventory = inventory/byo/hosts.example
+# Uncomment to use the provided example inventory
+#inventory = inventory/hosts.example
 
 [inventory]
 # fail more helpfully when the inventory file does not parse (Ansible 2.4+)
diff --git a/images/installer/root/exports/manifest.json b/images/installer/root/exports/manifest.json
index 8b984d7a3..53696b03e 100644
--- a/images/installer/root/exports/manifest.json
+++ b/images/installer/root/exports/manifest.json
@@ -4,7 +4,7 @@
         "OPTS": "",
         "VAR_LIB_OPENSHIFT_INSTALLER" : "/var/lib/openshift-installer",
         "VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log",
-        "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml",
+        "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml",
 	"HOME_ROOT": "/root",
 	"ANSIBLE_CONFIG": "/usr/share/atomic-openshift-utils/ansible.cfg",
         "INVENTORY_FILE": "/dev/null"
diff --git a/inventory/byo/.gitignore b/inventory/.gitignore
index 6ff331c7e..6ff331c7e 100644
--- a/inventory/byo/.gitignore
+++ b/inventory/.gitignore
diff --git a/inventory/README.md b/inventory/README.md
index 5e26e3c32..2e348194f 100644
--- a/inventory/README.md
+++ b/inventory/README.md
@@ -1,5 +1 @@
-# OpenShift Ansible inventory config files
-
-You can install OpenShift on:
-
-* [BYO](byo/) (Bring your own), use this inventory config file to install OpenShift on your pre-existing hosts
+# OpenShift Ansible example inventory config files
diff --git a/inventory/byo/hosts.example b/inventory/hosts.example
index e3b56d7a1..c18a53671 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/hosts.example
@@ -1,4 +1,4 @@
-# This is an example of a bring your own (byo) host inventory
+# This is an example of an OpenShift-Ansible host inventory
 
 # Create an OSEv3 group that contains the masters and nodes groups
 [OSEv3:children]
@@ -1047,7 +1047,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # name and password AND are trying to use integration scripts.
 #
 # For example, adding this cluster as a container provider,
-# playbooks/byo/openshift-management/add_container_provider.yml
+# playbooks/openshift-management/add_container_provider.yml
 #openshift_management_username: admin
 #openshift_management_password: smartvm
 
diff --git a/inventory/byo/hosts.byo.glusterfs.external.example b/inventory/hosts.glusterfs.external.example
index acf68266e..bf2557cf0 100644
--- a/inventory/byo/hosts.byo.glusterfs.external.example
+++ b/inventory/hosts.glusterfs.external.example
@@ -1,11 +1,11 @@
-# This is an example of a bring your own (byo) host inventory for a cluster
+# This is an example of an OpenShift-Ansible host inventory for a cluster
 # with natively hosted, containerized GlusterFS storage.
 #
-# This inventory may be used with the byo/config.yml playbook to deploy a new
+# This inventory may be used with the deploy_cluster.yml playbook to deploy a new
 # cluster with GlusterFS storage, which will use that storage to create a
 # volume that will provide backend storage for a hosted Docker registry.
 #
-# This inventory may also be used with byo/openshift-glusterfs/config.yml to
+# This inventory may also be used with openshift-glusterfs/config.yml to
 # deploy GlusterFS storage on an existing cluster. With this playbook, the
 # registry backend volume will be created but the administrator must then
 # either deploy a hosted registry or change an existing hosted registry to use
@@ -13,7 +13,7 @@
 #
 # There are additional configuration parameters that can be specified to
 # control the deployment and state of a GlusterFS cluster. Please see the
-# documentation in playbooks/byo/openshift-glusterfs/README.md and
+# documentation in playbooks/openshift-glusterfs/README.md and
 # roles/openshift_storage_glusterfs/README.md for additional details.
 
 [OSEv3:children]
@@ -44,7 +44,7 @@ node2   openshift_schedulable=True
 master
 
 # Specify the glusterfs group, which contains the nodes of the external
-# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname" 
+# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname"
 # and "glusterfs_devices" variables defined.
 #
 # The first variable indicates the hostname of the external GLusterFS node,
diff --git a/inventory/byo/hosts.byo.glusterfs.mixed.example b/inventory/hosts.glusterfs.mixed.example
index a559dc377..8a20a037e 100644
--- a/inventory/byo/hosts.byo.glusterfs.mixed.example
+++ b/inventory/hosts.glusterfs.mixed.example
@@ -1,11 +1,11 @@
-# This is an example of a bring your own (byo) host inventory for a cluster
+# This is an example of an OpenShift-Ansible host inventory for a cluster
 # with natively hosted, containerized GlusterFS storage.
 #
-# This inventory may be used with the byo/config.yml playbook to deploy a new
+# This inventory may be used with the deploy_cluster.yml playbook to deploy a new
 # cluster with GlusterFS storage, which will use that storage to create a
 # volume that will provide backend storage for a hosted Docker registry.
 #
-# This inventory may also be used with byo/openshift-glusterfs/config.yml to
+# This inventory may also be used with openshift-glusterfs/config.yml to
 # deploy GlusterFS storage on an existing cluster. With this playbook, the
 # registry backend volume will be created but the administrator must then
 # either deploy a hosted registry or change an existing hosted registry to use
@@ -13,7 +13,7 @@
 #
 # There are additional configuration parameters that can be specified to
 # control the deployment and state of a GlusterFS cluster. Please see the
-# documentation in playbooks/byo/openshift-glusterfs/README.md and
+# documentation in playbooks/openshift-glusterfs/README.md and
 # roles/openshift_storage_glusterfs/README.md for additional details.
 
 [OSEv3:children]
@@ -47,7 +47,7 @@ node2   openshift_schedulable=True
 master
 
 # Specify the glusterfs group, which contains the nodes of the external
-# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname" 
+# GlusterFS cluster. At a minimum, each node must have "glusterfs_hostname"
 # and "glusterfs_devices" variables defined.
 #
 # The first variable indicates the hostname of the external GLusterFS node,
diff --git a/inventory/byo/hosts.byo.glusterfs.native.example b/inventory/hosts.glusterfs.native.example
index ca4765c53..59acf1194 100644
--- a/inventory/byo/hosts.byo.glusterfs.native.example
+++ b/inventory/hosts.glusterfs.native.example
@@ -1,16 +1,16 @@
-# This is an example of a bring your own (byo) host inventory for a cluster
+# This is an example of an OpenShift-Ansible host inventory for a cluster
 # with natively hosted, containerized GlusterFS storage for applications. It
-# will also autmatically create a StorageClass for this purpose.
+# will also automatically create a StorageClass for this purpose.
 #
-# This inventory may be used with the byo/config.yml playbook to deploy a new
+# This inventory may be used with the deploy_cluster.yml playbook to deploy a new
 # cluster with GlusterFS storage.
 #
-# This inventory may also be used with byo/openshift-glusterfs/config.yml to
+# This inventory may also be used with openshift-glusterfs/config.yml to
 # deploy GlusterFS storage on an existing cluster.
 #
 # There are additional configuration parameters that can be specified to
 # control the deployment and state of a GlusterFS cluster. Please see the
-# documentation in playbooks/byo/openshift-glusterfs/README.md and
+# documentation in playbooks/openshift-glusterfs/README.md and
 # roles/openshift_storage_glusterfs/README.md for additional details.
 
 [OSEv3:children]
diff --git a/inventory/byo/hosts.byo.glusterfs.registry-only.example b/inventory/hosts.glusterfs.registry-only.example
index 32040f593..6f33e9f6d 100644
--- a/inventory/byo/hosts.byo.glusterfs.registry-only.example
+++ b/inventory/hosts.glusterfs.registry-only.example
@@ -1,12 +1,12 @@
-# This is an example of a bring your own (byo) host inventory for a cluster
+# This is an example of an OpenShift-Ansible host inventory for a cluster
 # with natively hosted, containerized GlusterFS storage for exclusive use
 # as storage for a natively hosted Docker registry.
 #
-# This inventory may be used with the byo/config.yml playbook to deploy a new
+# This inventory may be used with the deploy_cluster.yml playbook to deploy a new
 # cluster with GlusterFS storage, which will use that storage to create a
 # volume that will provide backend storage for a hosted Docker registry.
 #
-# This inventory may also be used with byo/openshift-glusterfs/registry.yml to
+# This inventory may also be used with openshift-glusterfs/registry.yml to
 # deploy GlusterFS storage on an existing cluster. With this playbook, the
 # registry backend volume will be created but the administrator must then
 # either deploy a hosted registry or change an existing hosted registry to use
@@ -14,7 +14,7 @@
 #
 # There are additional configuration parameters that can be specified to
 # control the deployment and state of a GlusterFS cluster. Please see the
-# documentation in playbooks/byo/openshift-glusterfs/README.md and
+# documentation in playbooks/openshift-glusterfs/README.md and
 # roles/openshift_storage_glusterfs/README.md for additional details.
 
 [OSEv3:children]
diff --git a/inventory/byo/hosts.byo.glusterfs.storage-and-registry.example b/inventory/hosts.glusterfs.storage-and-registry.example
index 9bd37cbf6..1f3a4282a 100644
--- a/inventory/byo/hosts.byo.glusterfs.storage-and-registry.example
+++ b/inventory/hosts.glusterfs.storage-and-registry.example
@@ -1,12 +1,12 @@
-# This is an example of a bring your own (byo) host inventory for a cluster
+# This is an example of an OpenShift-Ansible host inventory for a cluster
 # with natively hosted, containerized GlusterFS storage for both general
 # application use and a natively hosted Docker registry. It will also create a
 # StorageClass for the general storage.
 #
-# This inventory may be used with the byo/config.yml playbook to deploy a new
+# This inventory may be used with the deploy_cluster.yml playbook to deploy a new
 # cluster with GlusterFS storage.
 #
-# This inventory may also be used with byo/openshift-glusterfs/config.yml to
+# This inventory may also be used with openshift-glusterfs/config.yml to
 # deploy GlusterFS storage on an existing cluster. With this playbook, the
 # registry backend volume will be created but the administrator must then
 # either deploy a hosted registry or change an existing hosted registry to use
@@ -14,7 +14,7 @@
 #
 # There are additional configuration parameters that can be specified to
 # control the deployment and state of a GlusterFS cluster. Please see the
-# documentation in playbooks/byo/openshift-glusterfs/README.md and
+# documentation in playbooks/openshift-glusterfs/README.md and
 # roles/openshift_storage_glusterfs/README.md for additional details.
 
 [OSEv3:children]
diff --git a/inventory/byo/hosts.openstack b/inventory/hosts.openstack
index c648078c4..d928c2b86 100644
--- a/inventory/byo/hosts.openstack
+++ b/inventory/hosts.openstack
@@ -1,4 +1,4 @@
-# This is an example of a bring your own (byo) host inventory
+# This is an example of an OpenShift-Ansible host inventory
 
 # Create an OSEv3 group that contains the masters and nodes groups
 [OSEv3:children]
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 7d543afdd..187405cd2 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -67,7 +67,7 @@ rm -f %{buildroot}%{python_sitelib}/openshift_ansible/gce
 # openshift-ansible-docs install
 # Install example inventory into docs/examples
 mkdir -p docs/example-inventories
-cp inventory/byo/* docs/example-inventories/
+cp inventory/* docs/example-inventories/
 
 # openshift-ansible-files install
 cp -rp files %{buildroot}%{_datadir}/ansible/%{name}/
@@ -286,13 +286,13 @@ Atomic OpenShift Utilities includes
 
 %changelog
 * Thu Nov 23 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.13.0
-- 
+-
 
 * Thu Nov 23 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.12.0
-- 
+-
 
 * Thu Nov 23 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.11.0
-- 
+-
 
 * Thu Nov 23 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.10.0
 - tox.ini: simplify unit test reqs (lmeyer@redhat.com)
@@ -341,16 +341,16 @@ Atomic OpenShift Utilities includes
 - Include Deprecation - Init Playbook Paths (rteague@redhat.com)
 
 * Mon Nov 20 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.8.0
-- 
+-
 
 * Mon Nov 20 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.7.0
-- 
+-
 
 * Mon Nov 20 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.6.0
-- 
+-
 
 * Sun Nov 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.5.0
-- 
+-
 
 * Sun Nov 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.8.0-0.4.0
 - bug 1498398. Enclose content between store tag (rromerom@redhat.com)
@@ -643,10 +643,10 @@ Atomic OpenShift Utilities includes
 - Allow cluster IP for docker-registry service to be set (hansmi@vshn.ch)
 
 * Thu Nov 09 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.5-1
-- 
+-
 
 * Wed Nov 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.4-1
-- 
+-
 
 * Wed Nov 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.3-1
 - Adding configuration for keeping transient namespace on error.
@@ -816,10 +816,10 @@ Atomic OpenShift Utilities includes
 - GlusterFS: Remove image option from heketi command (jarrpa@redhat.com)
 
 * Mon Oct 30 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.187.0
-- 
+-
 
 * Sun Oct 29 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.186.0
-- 
+-
 
 * Sat Oct 28 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.185.0
 - bug 1506073. Lower cpu request for logging when it exceeds limit
@@ -849,7 +849,7 @@ Atomic OpenShift Utilities includes
 - Refactor health check playbooks (rteague@redhat.com)
 
 * Fri Oct 27 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.183.0
-- 
+-
 
 * Thu Oct 26 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.182.0
 - Fixing documentation for the cert_key_path variable name.
@@ -923,16 +923,16 @@ Atomic OpenShift Utilities includes
   (hansmi@vshn.ch)
 
 * Mon Oct 23 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.175.0
-- 
+-
 
 * Sun Oct 22 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.174.0
-- 
+-
 
 * Sun Oct 22 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.173.0
-- 
+-
 
 * Sun Oct 22 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.172.0
-- 
+-
 
 * Sat Oct 21 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.171.0
 - Use "requests" for CPU resources instead of limits
@@ -956,16 +956,16 @@ Atomic OpenShift Utilities includes
   (dymurray@redhat.com)
 
 * Fri Oct 20 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.168.0
-- 
+-
 
 * Thu Oct 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.167.0
-- 
+-
 
 * Thu Oct 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.166.0
-- 
+-
 
 * Thu Oct 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.165.0
-- 
+-
 
 * Thu Oct 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.164.0
 - Change to service-signer.crt for template_service_broker CA_BUNDLE
@@ -988,7 +988,7 @@ Atomic OpenShift Utilities includes
 - Remove unneeded master config updates during upgrades (mgugino@redhat.com)
 
 * Wed Oct 18 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.161.0
-- 
+-
 
 * Wed Oct 18 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.160.0
 - Fix pvc selector default to be empty dict instead of string
@@ -1030,16 +1030,16 @@ Atomic OpenShift Utilities includes
   (jchaloup@redhat.com)
 
 * Sun Oct 15 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.155.0
-- 
+-
 
 * Sat Oct 14 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.154.0
-- 
+-
 
 * Fri Oct 13 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.153.0
 - default groups.oo_new_etcd_to_config to an empty list (jchaloup@redhat.com)
 
 * Fri Oct 13 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.152.0
-- 
+-
 
 * Fri Oct 13 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.151.0
 - updated dynamic provision section for openshift metrics to support storage
@@ -1448,7 +1448,7 @@ Atomic OpenShift Utilities includes
 - oc_atomic_container: support Skopeo output (gscrivan@redhat.com)
 
 * Tue Sep 05 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.125.0
-- 
+-
 
 * Tue Sep 05 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.124.0
 - Fix ansible_syntax check (rteague@redhat.com)
@@ -1475,7 +1475,7 @@ Atomic OpenShift Utilities includes
   (miciah.masters@gmail.com)
 
 * Wed Aug 30 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.123.0
-- 
+-
 
 * Wed Aug 30 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.122.0
 - Update openshift_hosted_routers example to be in ini format.
@@ -1537,10 +1537,10 @@ Atomic OpenShift Utilities includes
 - Add missing hostnames to registry cert (sdodson@redhat.com)
 
 * Fri Aug 25 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.115.0
-- 
+-
 
 * Fri Aug 25 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.114.0
-- 
+-
 
 * Fri Aug 25 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.113.0
 - openshift_version: enterprise accepts new style pre-release
@@ -1558,13 +1558,13 @@ Atomic OpenShift Utilities includes
 - Setup tuned profiles in /etc/tuned (jmencak@redhat.com)
 
 * Thu Aug 24 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.109.0
-- 
+-
 
 * Thu Aug 24 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.108.0
-- 
+-
 
 * Thu Aug 24 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.107.0
-- 
+-
 
 * Thu Aug 24 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.106.0
 - Add dotnet 2.0 to v3.6 (sdodson@redhat.com)
@@ -1601,13 +1601,13 @@ Atomic OpenShift Utilities includes
   (sdodson@redhat.com)
 
 * Sat Aug 19 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.103.0
-- 
+-
 
 * Fri Aug 18 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.102.0
-- 
+-
 
 * Fri Aug 18 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.101.0
-- 
+-
 
 * Fri Aug 18 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.100.0
 - Change memory requests and limits units (mak@redhat.com)
@@ -1906,13 +1906,13 @@ Atomic OpenShift Utilities includes
   (kwoodson@redhat.com)
 
 * Mon Jul 17 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.152-1
-- 
+-
 
 * Sun Jul 16 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.151-1
-- 
+-
 
 * Sun Jul 16 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.150-1
-- 
+-
 
 * Sat Jul 15 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.149-1
 - Config was missed before replace. (jkaur@redhat.com)
@@ -1935,7 +1935,7 @@ Atomic OpenShift Utilities includes
 - GlusterFS: Fix SSH-based heketi configuration (jarrpa@redhat.com)
 
 * Wed Jul 12 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.143-1
-- 
+-
 
 * Wed Jul 12 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.142-1
 - add scheduled pods check (jvallejo@redhat.com)
@@ -1960,7 +1960,7 @@ Atomic OpenShift Utilities includes
 - updating fetch tasks to be flat paths (ewolinet@redhat.com)
 
 * Mon Jul 10 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.140-1
-- 
+-
 
 * Sat Jul 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.139-1
 - increase implicit 300s default timeout to explicit 600s (jchaloup@redhat.com)
@@ -2008,7 +2008,7 @@ Atomic OpenShift Utilities includes
 - Fully qualify ocp ansible_service_broker_image_prefix (sdodson@redhat.com)
 
 * Wed Jul 05 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.134-1
-- 
+-
 
 * Tue Jul 04 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.133-1
 - etcd, syscontainer: fix copy of existing datastore (gscrivan@redhat.com)
@@ -2020,7 +2020,7 @@ Atomic OpenShift Utilities includes
 - Fixes to storage migration (sdodson@redhat.com)
 
 * Mon Jul 03 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.132-1
-- 
+-
 
 * Sun Jul 02 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.131-1
 - Fix upgrade (sdodson@redhat.com)
@@ -2161,7 +2161,7 @@ Atomic OpenShift Utilities includes
 - bug 1457642. Use same SG index to avoid seeding timeout (jcantril@redhat.com)
 
 * Wed Jun 21 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.122-1
-- 
+-
 
 * Tue Jun 20 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.121-1
 - Updating default from null to "" (ewolinet@redhat.com)
@@ -2205,7 +2205,7 @@ Atomic OpenShift Utilities includes
 - CloudForms 4.5 templates (simaishi@redhat.com)
 
 * Fri Jun 16 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.114-1
-- 
+-
 
 * Fri Jun 16 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.113-1
 - Make rollout status check best-effort, add poll (skuznets@redhat.com)
@@ -2267,7 +2267,7 @@ Atomic OpenShift Utilities includes
 - singletonize some role tasks that repeat a lot (lmeyer@redhat.com)
 
 * Wed Jun 14 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.109-1
-- 
+-
 
 * Wed Jun 14 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.108-1
 - Upgraded Calico to 2.2.1 Release (vincent.schwarzer@yahoo.de)
@@ -2323,7 +2323,7 @@ Atomic OpenShift Utilities includes
 - Install default storageclass in AWS & GCE envs (hekumar@redhat.com)
 
 * Fri Jun 09 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.98-1
-- 
+-
 
 * Fri Jun 09 2017 Scott Dodson <sdodson@redhat.com> 3.6.97-1
 - Updated to using oo_random_word for secret gen (ewolinet@redhat.com)
@@ -2355,7 +2355,7 @@ Atomic OpenShift Utilities includes
   loopback kubeconfigs. (abutcher@redhat.com)
 
 * Tue Jun 06 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.89.2-1
-- 
+-
 
 * Tue Jun 06 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.89.1-1
 - Updating image for registry_console (ewolinet@redhat.com)
@@ -2602,13 +2602,13 @@ Atomic OpenShift Utilities includes
 - Fix additional master cert & client config creation. (abutcher@redhat.com)
 
 * Tue May 09 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.62-1
-- 
+-
 
 * Tue May 09 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.61-1
-- 
+-
 
 * Mon May 08 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.60-1
-- 
+-
 
 * Mon May 08 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.59-1
 - Updating logging and metrics to restart api, ha and controllers when updating
@@ -2621,10 +2621,10 @@ Atomic OpenShift Utilities includes
 - Moving Dockerfile content to images dir (jupierce@redhat.com)
 
 * Mon May 08 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.57-1
-- 
+-
 
 * Sun May 07 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.56-1
-- 
+-
 
 * Sat May 06 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.55-1
 - Fix 1448368, and some other minors issues (ghuang@redhat.com)
diff --git a/playbooks/aws/README.md b/playbooks/aws/README.md
index 417fb539a..c6fc75a50 100644
--- a/playbooks/aws/README.md
+++ b/playbooks/aws/README.md
@@ -75,7 +75,7 @@ If customization is required for the instances, scale groups, or any other confi
 In order to create the bootstrap-able AMI we need to create a basic openshift-ansible inventory.  This enables us to create the AMI using the openshift-ansible node roles.  This inventory should not include any hosts, but certain variables should be defined in the appropriate groups, just as deploying a cluster
 using the normal openshift-ansible method.  See provisioning-inventory.example.ini for an example.
 
-There are more examples of cluster inventory settings [`here`](../../inventory/byo/).
+There are more examples of cluster inventory settings [`here`](../../inventory/).
 
 #### Step 0 (optional)
 
@@ -138,7 +138,7 @@ $ ansible-playbook -i inventory.yml install.yml @provisioning_vars.yml
 ```
 This playbook accomplishes the following:
 1. Builds a dynamic inventory file by querying AWS.
-2. Runs the [`byo`](../../common/openshift-cluster/config.yml)
+2. Runs the [`deploy_cluster.yml`](../deploy_cluster.yml)
 
 Once this playbook completes, the cluster masters should be installed and configured.
 
diff --git a/playbooks/byo/config.yml b/playbooks/byo/config.yml
deleted file mode 100644
index 4b74e5bce..000000000
--- a/playbooks/byo/config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# TODO (rteague): Temporarily leaving this playbook to allow CI tests to operate until CI jobs are updated.
-- import_playbook: ../deploy_cluster.yml
diff --git a/playbooks/openshift-logging/config.yml b/playbooks/openshift-logging/config.yml
index d71b4f1c5..83d330284 100644
--- a/playbooks/openshift-logging/config.yml
+++ b/playbooks/openshift-logging/config.yml
@@ -1,7 +1,7 @@
 ---
 #
 # This playbook is a preview of upcoming changes for installing
-# Hosted logging on.  See inventory/byo/hosts.*.example for the
+# Hosted logging on.  See inventory/hosts.example for the
 # currently supported method.
 #
 - import_playbook: ../init/main.yml
diff --git a/playbooks/openshift-master/private/redeploy-openshift-ca.yml b/playbooks/openshift-master/private/redeploy-openshift-ca.yml
index 2a190935e..9f5502141 100644
--- a/playbooks/openshift-master/private/redeploy-openshift-ca.yml
+++ b/playbooks/openshift-master/private/redeploy-openshift-ca.yml
@@ -56,7 +56,7 @@
     - groups.oo_etcd_to_config | default([]) | length == 0
     - (g_master_config_output.content|b64decode|from_yaml).etcdConfig.servingInfo.clientCA != 'ca-bundle.crt'
   # Set servingInfo.clientCA to client-ca-bundle.crt in order to roll the CA certificate.
-  # This change will be reverted in playbooks/byo/openshift-cluster/redeploy-certificates.yml
+  # This change will be reverted in playbooks/redeploy-certificates.yml
   - modify_yaml:
       dest: "{{ openshift.common.config_base }}/master/master-config.yaml"
       yaml_key: servingInfo.clientCA
diff --git a/playbooks/openstack/README.md b/playbooks/openstack/README.md
index f567242cd..d361d6278 100644
--- a/playbooks/openstack/README.md
+++ b/playbooks/openstack/README.md
@@ -226,7 +226,7 @@ advanced configuration:
 [hardware-requirements]: https://docs.openshift.org/latest/install_config/install/prerequisites.html#hardware
 [origin]: https://www.openshift.org/
 [centos7]: https://www.centos.org/
-[sample-openshift-inventory]: https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.example
+[sample-openshift-inventory]: https://github.com/openshift/openshift-ansible/blob/master/inventory/hosts.example
 [advanced-configuration]: ./advanced-configuration.md
 [accessing-openshift]: ./advanced-configuration.md#accessing-the-openshift-cluster
 [uninstall-openshift]: ./advanced-configuration.md#removing-the-openshift-cluster
diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md
index db2a13d38..403e0e1a7 100644
--- a/playbooks/openstack/advanced-configuration.md
+++ b/playbooks/openstack/advanced-configuration.md
@@ -343,7 +343,7 @@ installation for example by specifying the authentication.
 
 The full list of options is available in this sample inventory:
 
-https://github.com/openshift/openshift-ansible/blob/master/inventory/byo/hosts.ose.example
+https://github.com/openshift/openshift-ansible/blob/master/inventory/hosts.example
 
 Note, that in order to deploy OpenShift origin, you should update the following
 variables for the `inventory/group_vars/OSEv3.yml`, `all.yml`:
@@ -604,7 +604,7 @@ A library of custom post-provision actions exists in `openshift-ansible-contrib/
 
 Once it succeeds, you can install openshift by running:
 
-    ansible-playbook openshift-ansible/playbooks/byo/config.yml
+    ansible-playbook openshift-ansible/playbooks/deploy_cluster.yml
 
 ## Access UI
 
diff --git a/roles/openshift_health_checker/HOWTO_CHECKS.md b/roles/openshift_health_checker/HOWTO_CHECKS.md
index 6c5662a4e..94961f2d4 100644
--- a/roles/openshift_health_checker/HOWTO_CHECKS.md
+++ b/roles/openshift_health_checker/HOWTO_CHECKS.md
@@ -12,7 +12,7 @@ Checks are typically implemented as two parts:
 
 The checks are called from Ansible playbooks via the `openshift_health_check`
 action plugin. See
-[playbooks/byo/openshift-preflight/check.yml](../../playbooks/byo/openshift-preflight/check.yml)
+[playbooks/openshift-checks/pre-install.yml](../../playbooks/openshift-checks/pre-install.yml)
 for an example.
 
 The action plugin dynamically discovers all checks and executes only those
diff --git a/roles/openshift_management/README.md b/roles/openshift_management/README.md
index 96de82669..974d9781a 100644
--- a/roles/openshift_management/README.md
+++ b/roles/openshift_management/README.md
@@ -164,14 +164,14 @@ away.
 If you want to install CFME/MIQ at the same time you install your
 OCP/Origin cluster, ensure that `openshift_management_install_management` is set
 to `true` in your inventory. Call the standard
-`playbooks/byo/config.yml` playbook to begin the cluster and CFME/MIQ
+`playbooks/deploy_cluster.yml` playbook to begin the cluster and CFME/MIQ
 installation.
 
 If you are installing CFME/MIQ on an *already provisioned cluster*
 then you can call the CFME/MIQ playbook directly:
 
 ```
-$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/config.yml
+$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/config.yml
 ```
 
 *Note: Use `miq-template` in the following examples for ManageIQ installs*
@@ -489,7 +489,7 @@ This playbook will:
 
 
 ```
-$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/byo/openshift-management/add_container_provider.yml
+$ ansible-playbook -v -i <YOUR_INVENTORY> playbooks/openshift-management/add_container_provider.yml
 ```
 
 ## Multiple Providers
@@ -567,7 +567,7 @@ the config file path.
 
 ```
 $ ansible-playbook -v -e container_providers_config=/tmp/cp.yml \
-      playbooks/byo/openshift-management/add_many_container_providers.yml
+      playbooks/openshift-management/add_many_container_providers.yml
 ```
 
 Afterwards you will find two new container providers in your
@@ -579,7 +579,7 @@ to see an overview.
 This role includes a playbook to uninstall and erase the CFME/MIQ
 installation:
 
-* `playbooks/byo/openshift-management/uninstall.yml`
+* `playbooks/openshift-management/uninstall.yml`
 
 NFS export definitions and data stored on NFS exports are not
 automatically removed. You are urged to manually erase any data from
diff --git a/roles/openshift_management/defaults/main.yml b/roles/openshift_management/defaults/main.yml
index e768961ce..b5e234b7f 100644
--- a/roles/openshift_management/defaults/main.yml
+++ b/roles/openshift_management/defaults/main.yml
@@ -88,7 +88,7 @@ openshift_management_storage_nfs_local_hostname: false
 # name and password AND are trying to use integration scripts.
 #
 # For example, adding this cluster as a container provider,
-# playbooks/byo/openshift-management/add_container_provider.yml
+# playbooks/openshift-management/add_container_provider.yml
 openshift_management_username: admin
 openshift_management_password: smartvm
 
diff --git a/setup.py b/setup.py
index 4a25d0bce..5ba050b83 100644
--- a/setup.py
+++ b/setup.py
@@ -345,35 +345,29 @@ class OpenShiftAnsibleSyntaxCheck(Command):
             print('-' * 60)
             print('Syntax checking playbook: {}'.format(playbook))
 
-            # Error on any entry points in 'common'
-            if 'common' in playbook:
-                print('{}Invalid entry point playbook. All playbooks must'
-                      ' start in playbooks/byo{}'.format(self.FAIL, self.ENDC))
-                has_errors = True
             # --syntax-check each entry point playbook
-            else:
-                try:
-                    # Create a host group list to avoid WARNING on unmatched host patterns
-                    host_group_list = [
-                        'etcd,masters,nodes,OSEv3',
-                        'oo_all_hosts',
-                        'oo_etcd_to_config,oo_new_etcd_to_config,oo_first_etcd,oo_etcd_hosts_to_backup,'
-                        'oo_etcd_hosts_to_upgrade,oo_etcd_to_migrate',
-                        'oo_masters,oo_masters_to_config,oo_first_master,oo_containerized_master_nodes',
-                        'oo_nodes_to_config,oo_nodes_to_upgrade',
-                        'oo_nodes_use_kuryr,oo_nodes_use_flannel',
-                        'oo_nodes_use_calico,oo_nodes_use_nuage,oo_nodes_use_contiv',
-                        'oo_lb_to_config',
-                        'oo_nfs_to_config',
-                        'glusterfs,glusterfs_registry,']
-                    subprocess.check_output(
-                        ['ansible-playbook', '-i ' + ','.join(host_group_list),
-                         '--syntax-check', playbook]
-                    )
-                except subprocess.CalledProcessError as cpe:
-                    print('{}Execution failed: {}{}'.format(
-                        self.FAIL, cpe, self.ENDC))
-                    has_errors = True
+            try:
+                # Create a host group list to avoid WARNING on unmatched host patterns
+                host_group_list = [
+                    'etcd,masters,nodes,OSEv3',
+                    'oo_all_hosts',
+                    'oo_etcd_to_config,oo_new_etcd_to_config,oo_first_etcd,oo_etcd_hosts_to_backup,'
+                    'oo_etcd_hosts_to_upgrade,oo_etcd_to_migrate',
+                    'oo_masters,oo_masters_to_config,oo_first_master,oo_containerized_master_nodes',
+                    'oo_nodes_to_config,oo_nodes_to_upgrade',
+                    'oo_nodes_use_kuryr,oo_nodes_use_flannel',
+                    'oo_nodes_use_calico,oo_nodes_use_nuage,oo_nodes_use_contiv',
+                    'oo_lb_to_config',
+                    'oo_nfs_to_config',
+                    'glusterfs,glusterfs_registry,']
+                subprocess.check_output(
+                    ['ansible-playbook', '-i ' + ','.join(host_group_list),
+                     '--syntax-check', playbook]
+                )
+            except subprocess.CalledProcessError as cpe:
+                print('{}Execution failed: {}{}'.format(
+                    self.FAIL, cpe, self.ENDC))
+                has_errors = True
 
         if has_errors:
             raise SystemExit(1)