Misc fixes and restructuring

deploy-guide/source/architecture.rst

@@ -2,3 +2,10 @@
 
 Deployment architecture
 ~~~~~~~~~~~~~~~~~~~~~~~
+
+.. toctree::
+   :maxdepth: 2
+
+   service_arch.rst
+   network_arch.rst
+   storage_arch.rst

deploy-guide/source/configure_deployment.rst

@@ -2,3 +2,31 @@
 
 Configure the deployment
 ~~~~~~~~~~~~~~~~~~~~~~~~
+
+Service Placement
++++++++++++++++++
+
+TODO: Reference bundle for this documentation
+
+TODO: matrix of services and compatibility for placement
+
+Service Storage Configuration
++++++++++++++++++++++++++++++
+
+Service Networking Configuration
+++++++++++++++++++++++++++++++++
+
+High Availability VIPs
+----------------------
+
+Network Space Bindings
+----------------------
+
+OpenStack Networking Configuration
+++++++++++++++++++++++++++++++++++
+
+Overlay network configuration
+-----------------------------
+
+External network configuration
+------------------------------

deploy-guide/source/deploy.rst

@@ -1,4 +1,4 @@
 .. _deploy:
 
-Deploy
-~~~~~~
+Deploy the bundle
+~~~~~~~~~~~~~~~~~

deploy-guide/source/deployment_workflow.rst

@@ -2,3 +2,13 @@
 
 Deployment workflow
 ~~~~~~~~~~~~~~~~~~~
+
+The following diagram shows the high level workflow to deploy an
+OpenStack Cloud using MAAS, Juju and the OpenStack Charms.
+
+TODO: Diagram
+
+Prepare deployment environment
+Configure deployment bundle
+Deploy bundle
+Verify deployment

deploy-guide/source/network_arch.rst

@@ -0,0 +1,6 @@
+.. _network_arch:
+
+Network Archictecture
+~~~~~~~~~~~~~~~~~~~~~
+
+TODO:

deploy-guide/source/prepare_env.rst

@@ -2,3 +2,40 @@
 
 Prepare the deployment environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Install MAAS
+++++++++++++
+
+Enlist Servers
+++++++++++++++
+
+Commission Servers
+++++++++++++++++++
+
+Configure Servers
++++++++++++++++++
+
+Storage Configuration
+---------------------
+
+TODO: Bcache storage, LVM storage, recommendations
+
+Network Configuration
+---------------------
+
+TODO: bonding, vlans, recommendations
+
+Kernel Configuration
+--------------------
+
+TODO: hugepages, iommu, cpu isolation
+
+Configure Juju
+++++++++++++++
+
+TODO: General instructions on configuring Juju to use MAAS.
+
+Test Deployment
++++++++++++++++
+
+TODO: Deploy both physical servers and LXD containers using magpie.

deploy-guide/source/service_arch.rst

@@ -0,0 +1,6 @@
+.. _service_arch:
+
+Service Archictecture
+~~~~~~~~~~~~~~~~~~~~~
+
+TODO:

deploy-guide/source/storage_arch.rst

@@ -0,0 +1,6 @@
+.. _storage_arch:
+
+Storage Archictecture
+~~~~~~~~~~~~~~~~~~~~~
+
+TODO: