Merge "Cleanup installation docs"

2017-07-03 19:40:18 +00:00 · 2017-07-03 19:40:18 +00:00 · a995e6ced7
commit a995e6ced7
parent 7bc3d6d5fe 8ce88e52e0
6 changed files with 9 additions and 10 deletions
--- a/doc/source/install/developer/all-in-one.rst
+++ b/doc/source/install/developer/all-in-one.rst
--- a/doc/source/install/developer/gates.rst
+++ b/doc/source/install/developer/gates.rst
@ -0,0 +1 @@
+.. include:: ../../../../tools/gate/README.rst
--- a/doc/source/install/developer/index.rst
+++ b/doc/source/install/developer/index.rst
@ -1,9 +1,11 @@
-Developer installation
-======================
+Development
+===========

 Contents:

 .. toctree::
   :maxdepth: 2

+   all-in-one
+   gates
   vagrant
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@ -7,6 +7,4 @@ Contents:
   :maxdepth: 2

   developer/index
-   all-in-one
   multinode
-   third-party-tools
--- a/doc/source/install/third-party-tools.rst
+++ b/doc/source/install/third-party-tools.rst
@ -1,6 +0,0 @@
-=================
-Third-party tools
-=================
-
-Armada
-======
--- a/tools/vagrant/README.rst
+++ b/tools/vagrant/README.rst
@ -2,6 +2,10 @@
 Vagrant Deployment
 ==================

+A Vagrantfile has been provided in the ``tools/`` directory.  This
+vagrant installation will prep a single VM with specs from the ``config.rb``
+file, and will run OpenStack-Helm gate scripts to set up Kubernetes.
+
 Requirements
 ------------
				`@ -0,0 +1 @@`
				`.. include:: ../../../../tools/gate/README.rst`