From 7f22c5bee0b610e2b59da936f19149d099e49dcf Mon Sep 17 00:00:00 2001 From: gord chung Date: Tue, 18 Jul 2017 19:49:32 +0000 Subject: [PATCH] doc: move install guide to main doc dir Change-Id: Ifa323f9e4044dfd683c0bfd110a41ca9986601ef --- doc/source/index.rst | 1 + .../cinder/install-cinder-config-common.inc | 0 .../install}/cinder/install-cinder-obs.rst | 0 .../install}/cinder/install-cinder-rdo.rst | 0 .../install}/cinder/install-cinder-ubuntu.rst | 0 .../source => doc/source/install}/conf.py | 0 .../source/install}/get_started.rst | 0 .../install}/glance/install-glance-obs.rst | 0 .../install}/glance/install-glance-rdo.rst | 0 .../install}/glance/install-glance-ubuntu.rst | 0 .../source/install}/heat/install-heat-obs.rst | 0 .../source/install}/heat/install-heat-rdo.rst | 0 .../install}/heat/install-heat-ubuntu.rst | 0 doc/source/install/index.rst | 27 +++++++++++++++++++ .../install}/install-base-config-common.inc | 0 .../source/install}/install-base-obs.rst | 0 .../install}/install-base-prereq-common.inc | 0 .../source/install}/install-base-rdo.rst | 0 .../source/install}/install-base-ubuntu.rst | 0 .../install}/install-compute-common.inc | 0 .../source/install}/install-compute-obs.rst | 0 .../source/install}/install-compute-rdo.rst | 0 .../install}/install-compute-ubuntu.rst | 0 .../source/install}/install-compute.rst | 0 .../source/install}/install-controller.rst | 0 .../install}/neutron/install-neutron-obs.rst | 0 .../install}/neutron/install-neutron-rdo.rst | 0 .../neutron/install-neutron-ubuntu.rst | 0 .../source/install}/next-steps.rst | 0 .../swift/install-swift-config-common.inc | 0 .../install}/swift/install-swift-obs.rst | 0 .../swift/install-swift-prereq-common.inc | 0 .../install}/swift/install-swift-rdo.rst | 0 .../install}/swift/install-swift-ubuntu.rst | 0 .../source => doc/source/install}/verify.rst | 0 install-guide/source/index.rst | 15 ----------- 36 files changed, 28 insertions(+), 15 deletions(-) rename {install-guide/source => doc/source/install}/cinder/install-cinder-config-common.inc (100%) rename {install-guide/source => doc/source/install}/cinder/install-cinder-obs.rst (100%) rename {install-guide/source => doc/source/install}/cinder/install-cinder-rdo.rst (100%) rename {install-guide/source => doc/source/install}/cinder/install-cinder-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/conf.py (100%) rename {install-guide/source => doc/source/install}/get_started.rst (100%) rename {install-guide/source => doc/source/install}/glance/install-glance-obs.rst (100%) rename {install-guide/source => doc/source/install}/glance/install-glance-rdo.rst (100%) rename {install-guide/source => doc/source/install}/glance/install-glance-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/heat/install-heat-obs.rst (100%) rename {install-guide/source => doc/source/install}/heat/install-heat-rdo.rst (100%) rename {install-guide/source => doc/source/install}/heat/install-heat-ubuntu.rst (100%) create mode 100644 doc/source/install/index.rst rename {install-guide/source => doc/source/install}/install-base-config-common.inc (100%) rename {install-guide/source => doc/source/install}/install-base-obs.rst (100%) rename {install-guide/source => doc/source/install}/install-base-prereq-common.inc (100%) rename {install-guide/source => doc/source/install}/install-base-rdo.rst (100%) rename {install-guide/source => doc/source/install}/install-base-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/install-compute-common.inc (100%) rename {install-guide/source => doc/source/install}/install-compute-obs.rst (100%) rename {install-guide/source => doc/source/install}/install-compute-rdo.rst (100%) rename {install-guide/source => doc/source/install}/install-compute-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/install-compute.rst (100%) rename {install-guide/source => doc/source/install}/install-controller.rst (100%) rename {install-guide/source => doc/source/install}/neutron/install-neutron-obs.rst (100%) rename {install-guide/source => doc/source/install}/neutron/install-neutron-rdo.rst (100%) rename {install-guide/source => doc/source/install}/neutron/install-neutron-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/next-steps.rst (100%) rename {install-guide/source => doc/source/install}/swift/install-swift-config-common.inc (100%) rename {install-guide/source => doc/source/install}/swift/install-swift-obs.rst (100%) rename {install-guide/source => doc/source/install}/swift/install-swift-prereq-common.inc (100%) rename {install-guide/source => doc/source/install}/swift/install-swift-rdo.rst (100%) rename {install-guide/source => doc/source/install}/swift/install-swift-ubuntu.rst (100%) rename {install-guide/source => doc/source/install}/verify.rst (100%) delete mode 100644 install-guide/source/index.rst diff --git a/doc/source/index.rst b/doc/source/index.rst index 4beca6ba12..7ca3c35b51 100644 --- 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 diff --git a/install-guide/source/cinder/install-cinder-config-common.inc b/doc/source/install/cinder/install-cinder-config-common.inc similarity index 100% rename from install-guide/source/cinder/install-cinder-config-common.inc rename to doc/source/install/cinder/install-cinder-config-common.inc diff --git a/install-guide/source/cinder/install-cinder-obs.rst b/doc/source/install/cinder/install-cinder-obs.rst similarity index 100% rename from install-guide/source/cinder/install-cinder-obs.rst rename to doc/source/install/cinder/install-cinder-obs.rst diff --git a/install-guide/source/cinder/install-cinder-rdo.rst b/doc/source/install/cinder/install-cinder-rdo.rst similarity index 100% rename from install-guide/source/cinder/install-cinder-rdo.rst rename to doc/source/install/cinder/install-cinder-rdo.rst diff --git a/install-guide/source/cinder/install-cinder-ubuntu.rst b/doc/source/install/cinder/install-cinder-ubuntu.rst similarity index 100% rename from install-guide/source/cinder/install-cinder-ubuntu.rst rename to doc/source/install/cinder/install-cinder-ubuntu.rst diff --git a/install-guide/source/conf.py b/doc/source/install/conf.py similarity index 100% rename from install-guide/source/conf.py rename to doc/source/install/conf.py diff --git a/install-guide/source/get_started.rst b/doc/source/install/get_started.rst similarity index 100% rename from install-guide/source/get_started.rst rename to doc/source/install/get_started.rst diff --git a/install-guide/source/glance/install-glance-obs.rst b/doc/source/install/glance/install-glance-obs.rst similarity index 100% rename from install-guide/source/glance/install-glance-obs.rst rename to doc/source/install/glance/install-glance-obs.rst diff --git a/install-guide/source/glance/install-glance-rdo.rst b/doc/source/install/glance/install-glance-rdo.rst similarity index 100% rename from install-guide/source/glance/install-glance-rdo.rst rename to doc/source/install/glance/install-glance-rdo.rst diff --git a/install-guide/source/glance/install-glance-ubuntu.rst b/doc/source/install/glance/install-glance-ubuntu.rst similarity index 100% rename from install-guide/source/glance/install-glance-ubuntu.rst rename to doc/source/install/glance/install-glance-ubuntu.rst diff --git a/install-guide/source/heat/install-heat-obs.rst b/doc/source/install/heat/install-heat-obs.rst similarity index 100% rename from install-guide/source/heat/install-heat-obs.rst rename to doc/source/install/heat/install-heat-obs.rst diff --git a/install-guide/source/heat/install-heat-rdo.rst b/doc/source/install/heat/install-heat-rdo.rst similarity index 100% rename from install-guide/source/heat/install-heat-rdo.rst rename to doc/source/install/heat/install-heat-rdo.rst diff --git a/install-guide/source/heat/install-heat-ubuntu.rst b/doc/source/install/heat/install-heat-ubuntu.rst similarity index 100% rename from install-guide/source/heat/install-heat-ubuntu.rst rename to doc/source/install/heat/install-heat-ubuntu.rst diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst new file mode 100644 index 0000000000..434ce49142 --- /dev/null +++ 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 `_. + +Ocata +~~~~ + +To install Ceilometer, see the Ocata Telmetry Data Collection service +`install guide `__ + +Newton +~~~~~ + +To install Ceilometer, see the Newton Telemetry Data Collection service +`install guide `__ diff --git a/install-guide/source/install-base-config-common.inc b/doc/source/install/install-base-config-common.inc similarity index 100% rename from install-guide/source/install-base-config-common.inc rename to doc/source/install/install-base-config-common.inc diff --git a/install-guide/source/install-base-obs.rst b/doc/source/install/install-base-obs.rst similarity index 100% rename from install-guide/source/install-base-obs.rst rename to doc/source/install/install-base-obs.rst diff --git a/install-guide/source/install-base-prereq-common.inc b/doc/source/install/install-base-prereq-common.inc similarity index 100% rename from install-guide/source/install-base-prereq-common.inc rename to doc/source/install/install-base-prereq-common.inc diff --git a/install-guide/source/install-base-rdo.rst b/doc/source/install/install-base-rdo.rst similarity index 100% rename from install-guide/source/install-base-rdo.rst rename to doc/source/install/install-base-rdo.rst diff --git a/install-guide/source/install-base-ubuntu.rst b/doc/source/install/install-base-ubuntu.rst similarity index 100% rename from install-guide/source/install-base-ubuntu.rst rename to doc/source/install/install-base-ubuntu.rst diff --git a/install-guide/source/install-compute-common.inc b/doc/source/install/install-compute-common.inc similarity index 100% rename from install-guide/source/install-compute-common.inc rename to doc/source/install/install-compute-common.inc diff --git a/install-guide/source/install-compute-obs.rst b/doc/source/install/install-compute-obs.rst similarity index 100% rename from install-guide/source/install-compute-obs.rst rename to doc/source/install/install-compute-obs.rst diff --git a/install-guide/source/install-compute-rdo.rst b/doc/source/install/install-compute-rdo.rst similarity index 100% rename from install-guide/source/install-compute-rdo.rst rename to doc/source/install/install-compute-rdo.rst diff --git a/install-guide/source/install-compute-ubuntu.rst b/doc/source/install/install-compute-ubuntu.rst similarity index 100% rename from install-guide/source/install-compute-ubuntu.rst rename to doc/source/install/install-compute-ubuntu.rst diff --git a/install-guide/source/install-compute.rst b/doc/source/install/install-compute.rst similarity index 100% rename from install-guide/source/install-compute.rst rename to doc/source/install/install-compute.rst diff --git a/install-guide/source/install-controller.rst b/doc/source/install/install-controller.rst similarity index 100% rename from install-guide/source/install-controller.rst rename to doc/source/install/install-controller.rst diff --git a/install-guide/source/neutron/install-neutron-obs.rst b/doc/source/install/neutron/install-neutron-obs.rst similarity index 100% rename from install-guide/source/neutron/install-neutron-obs.rst rename to doc/source/install/neutron/install-neutron-obs.rst diff --git a/install-guide/source/neutron/install-neutron-rdo.rst b/doc/source/install/neutron/install-neutron-rdo.rst similarity index 100% rename from install-guide/source/neutron/install-neutron-rdo.rst rename to doc/source/install/neutron/install-neutron-rdo.rst diff --git a/install-guide/source/neutron/install-neutron-ubuntu.rst b/doc/source/install/neutron/install-neutron-ubuntu.rst similarity index 100% rename from install-guide/source/neutron/install-neutron-ubuntu.rst rename to doc/source/install/neutron/install-neutron-ubuntu.rst diff --git a/install-guide/source/next-steps.rst b/doc/source/install/next-steps.rst similarity index 100% rename from install-guide/source/next-steps.rst rename to doc/source/install/next-steps.rst diff --git a/install-guide/source/swift/install-swift-config-common.inc b/doc/source/install/swift/install-swift-config-common.inc similarity index 100% rename from install-guide/source/swift/install-swift-config-common.inc rename to doc/source/install/swift/install-swift-config-common.inc diff --git a/install-guide/source/swift/install-swift-obs.rst b/doc/source/install/swift/install-swift-obs.rst similarity index 100% rename from install-guide/source/swift/install-swift-obs.rst rename to doc/source/install/swift/install-swift-obs.rst diff --git a/install-guide/source/swift/install-swift-prereq-common.inc b/doc/source/install/swift/install-swift-prereq-common.inc similarity index 100% rename from install-guide/source/swift/install-swift-prereq-common.inc rename to doc/source/install/swift/install-swift-prereq-common.inc diff --git a/install-guide/source/swift/install-swift-rdo.rst b/doc/source/install/swift/install-swift-rdo.rst similarity index 100% rename from install-guide/source/swift/install-swift-rdo.rst rename to doc/source/install/swift/install-swift-rdo.rst diff --git a/install-guide/source/swift/install-swift-ubuntu.rst b/doc/source/install/swift/install-swift-ubuntu.rst similarity index 100% rename from install-guide/source/swift/install-swift-ubuntu.rst rename to doc/source/install/swift/install-swift-ubuntu.rst diff --git a/install-guide/source/verify.rst b/doc/source/install/verify.rst similarity index 100% rename from install-guide/source/verify.rst rename to doc/source/install/verify.rst diff --git a/install-guide/source/index.rst b/install-guide/source/index.rst deleted file mode 100644 index 5db911f39e..0000000000 --- a/install-guide/source/index.rst +++ /dev/null @@ -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 `_.