From 8ce88e52e01ac5c49ebcb01e7c646acaee08c064 Mon Sep 17 00:00:00 2001
From: Larry Rensing <lr699s@att.com>
Date: Mon, 3 Jul 2017 11:54:29 -0500
Subject: [PATCH] Cleanup installation docs

This PS organizes the installation document tree for easier navigation
and updating relevant content.

Change-Id: I51951d99dfc06bf441bd65ca817119cbca061851
---
 doc/source/install/{ => developer}/all-in-one.rst | 0
 doc/source/install/developer/gates.rst            | 1 +
 doc/source/install/developer/index.rst            | 6 ++++--
 doc/source/install/index.rst                      | 2 --
 doc/source/install/third-party-tools.rst          | 6 ------
 tools/vagrant/README.rst                          | 4 ++++
 6 files changed, 9 insertions(+), 10 deletions(-)
 rename doc/source/install/{ => developer}/all-in-one.rst (100%)
 create mode 100644 doc/source/install/developer/gates.rst
 delete mode 100644 doc/source/install/third-party-tools.rst

diff --git a/doc/source/install/all-in-one.rst b/doc/source/install/developer/all-in-one.rst
similarity index 100%
rename from doc/source/install/all-in-one.rst
rename to doc/source/install/developer/all-in-one.rst
diff --git a/doc/source/install/developer/gates.rst b/doc/source/install/developer/gates.rst
new file mode 100644
index 0000000000..63e3a28605
--- /dev/null
+++ b/doc/source/install/developer/gates.rst
@@ -0,0 +1 @@
+.. include:: ../../../../tools/gate/README.rst
diff --git a/doc/source/install/developer/index.rst b/doc/source/install/developer/index.rst
index 0c3f1eee43..1fd3e29ecd 100644
--- 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
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 286a4da81e..e39206809c 100644
--- 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
diff --git a/doc/source/install/third-party-tools.rst b/doc/source/install/third-party-tools.rst
deleted file mode 100644
index 2a537d804d..0000000000
--- a/doc/source/install/third-party-tools.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-=================
-Third-party tools
-=================
-
-Armada
-======
diff --git a/tools/vagrant/README.rst b/tools/vagrant/README.rst
index a92e6a6901..8d84881263 100644
--- 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
 ------------