doc: move install guide to main doc dir

Change-Id: Ifa323f9e4044dfd683c0bfd110a41ca9986601ef
2017-07-18 19:49:32 +00:00 · 2017-07-18 19:49:32 +00:00 · 7f22c5bee0
commit 7f22c5bee0
parent ebb1fd5930
36 changed files with 28 additions and 15 deletions
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -34,6 +34,7 @@ Overview
 .. toctree::
   :maxdepth: 2

+   install/index
   contributor/index
   admin/index
   webapi/index
--- a/install-guide/source/cinder/install-cinder-config-common.inc
+++ b/install-guide/source/cinder/install-cinder-config-common.inc
--- a/install-guide/source/cinder/install-cinder-obs.rst
+++ b/install-guide/source/cinder/install-cinder-obs.rst
--- a/install-guide/source/cinder/install-cinder-rdo.rst
+++ b/install-guide/source/cinder/install-cinder-rdo.rst
--- a/install-guide/source/cinder/install-cinder-ubuntu.rst
+++ b/install-guide/source/cinder/install-cinder-ubuntu.rst
--- a/install-guide/source/conf.py
+++ b/install-guide/source/conf.py
--- a/install-guide/source/get_started.rst
+++ b/install-guide/source/get_started.rst
--- a/install-guide/source/glance/install-glance-obs.rst
+++ b/install-guide/source/glance/install-glance-obs.rst
--- a/install-guide/source/glance/install-glance-rdo.rst
+++ b/install-guide/source/glance/install-glance-rdo.rst
--- a/install-guide/source/glance/install-glance-ubuntu.rst
+++ b/install-guide/source/glance/install-glance-ubuntu.rst
--- a/install-guide/source/heat/install-heat-obs.rst
+++ b/install-guide/source/heat/install-heat-obs.rst
--- a/install-guide/source/heat/install-heat-rdo.rst
+++ b/install-guide/source/heat/install-heat-rdo.rst
--- a/install-guide/source/heat/install-heat-ubuntu.rst
+++ b/install-guide/source/heat/install-heat-ubuntu.rst
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@ -0,0 +1,27 @@
+==================
+Installation Guide
+==================
+
+.. toctree::
+   :maxdepth: 2
+
+   get_started.rst
+   install-compute.rst
+   install-controller.rst
+   verify.rst
+   next-steps.rst
+
+This chapter assumes a working setup of OpenStack following the
+`OpenStack Installation Tutorials and Guides <http://docs.openstack.org/#install-guides>`_.
+
+Ocata
+~~~~
+
+To install Ceilometer, see the Ocata Telmetry Data Collection service
+`install guide <https://docs.openstack.org/project-install-guide/telemetry/ocata/>`__
+
+Newton
+~~~~~
+
+To install Ceilometer, see the Newton Telemetry Data Collection service
+`install guide <https://docs.openstack.org/project-install-guide/telemetry/newton/>`__
--- a/install-guide/source/install-base-config-common.inc
+++ b/install-guide/source/install-base-config-common.inc
--- a/install-guide/source/install-base-obs.rst
+++ b/install-guide/source/install-base-obs.rst
--- a/install-guide/source/install-base-prereq-common.inc
+++ b/install-guide/source/install-base-prereq-common.inc
--- a/install-guide/source/install-base-rdo.rst
+++ b/install-guide/source/install-base-rdo.rst
--- a/install-guide/source/install-base-ubuntu.rst
+++ b/install-guide/source/install-base-ubuntu.rst
--- a/install-guide/source/install-compute-common.inc
+++ b/install-guide/source/install-compute-common.inc
--- a/install-guide/source/install-compute-obs.rst
+++ b/install-guide/source/install-compute-obs.rst
--- a/install-guide/source/install-compute-rdo.rst
+++ b/install-guide/source/install-compute-rdo.rst
--- a/install-guide/source/install-compute-ubuntu.rst
+++ b/install-guide/source/install-compute-ubuntu.rst
--- a/install-guide/source/install-compute.rst
+++ b/install-guide/source/install-compute.rst
--- a/install-guide/source/install-controller.rst
+++ b/install-guide/source/install-controller.rst
--- a/install-guide/source/neutron/install-neutron-obs.rst
+++ b/install-guide/source/neutron/install-neutron-obs.rst
--- a/install-guide/source/neutron/install-neutron-rdo.rst
+++ b/install-guide/source/neutron/install-neutron-rdo.rst
--- a/install-guide/source/neutron/install-neutron-ubuntu.rst
+++ b/install-guide/source/neutron/install-neutron-ubuntu.rst
--- a/install-guide/source/next-steps.rst
+++ b/install-guide/source/next-steps.rst
--- a/install-guide/source/swift/install-swift-config-common.inc
+++ b/install-guide/source/swift/install-swift-config-common.inc
--- a/install-guide/source/swift/install-swift-obs.rst
+++ b/install-guide/source/swift/install-swift-obs.rst
--- a/install-guide/source/swift/install-swift-prereq-common.inc
+++ b/install-guide/source/swift/install-swift-prereq-common.inc
--- a/install-guide/source/swift/install-swift-rdo.rst
+++ b/install-guide/source/swift/install-swift-rdo.rst
--- a/install-guide/source/swift/install-swift-ubuntu.rst
+++ b/install-guide/source/swift/install-swift-ubuntu.rst
--- a/install-guide/source/verify.rst
+++ b/install-guide/source/verify.rst
--- a/install-guide/source/index.rst
+++ b/install-guide/source/index.rst
@ -1,15 +0,0 @@
-=================================
-Telemetry Data Collection service
-=================================
-
-.. toctree::
-   :maxdepth: 2
-
-   get_started.rst
-   install-compute.rst
-   install-controller.rst
-   verify.rst
-   next-steps.rst
-
-This chapter assumes a working setup of OpenStack following the
-`OpenStack Installation Tutorials and Guides <http://docs.openstack.org/#install-guides>`_.