Merge "Restructured the doc of kolla-ansible"

2017-10-10 09:11:00 +00:00 · 2017-10-10 09:11:00 +00:00 · 4c1bdc0f5b
commit 4c1bdc0f5b
parent 8e2e437e6c 04fd12b945
8 changed files with 17 additions and 4 deletions
--- a/doc/source/admin/advanced-configuration.rst
+++ b/doc/source/admin/advanced-configuration.rst
--- a/doc/source/admin/deployment-philosophy.rst
+++ b/doc/source/admin/deployment-philosophy.rst
--- a/doc/source/admin/index.rst
+++ b/doc/source/admin/index.rst
@ -0,0 +1,9 @@
+Admin Guides
+============
+
+.. toctree::
+   :maxdepth: 1
+
+   advanced-configuration
+   production-architecture-guide
+   deployment-philosophy
--- a/doc/source/admin/production-architecture-guide.rst
+++ b/doc/source/admin/production-architecture-guide.rst
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@ -5,6 +5,7 @@ Developer Docs
   :maxdepth: 1

   CONTRIBUTING
+   kolla-for-openstack-development
   vagrant-dev-env
   running-tests
   bug-triage
--- a/doc/source/contributor/kolla-for-openstack-development.rst
+++ b/doc/source/contributor/kolla-for-openstack-development.rst
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -33,6 +33,13 @@ For information on building container images for use with Kolla-Ansible, please
 refer to the `Kolla image documentation
 <https://docs.openstack.org/kolla/latest/>`_.

+Admin Guides
+============
+
+.. toctree::
+   :maxdepth: 2
+
+   admin/index

 User Guides
 ===========
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@ -4,13 +4,9 @@ User Guides
 .. toctree::
   :maxdepth: 1

-   deployment-philosophy
-   production-architecture-guide
   quickstart
   multinode
   multi-regions
-   advanced-configuration
   operating-kolla
   security
-   kolla-for-openstack-development
   troubleshooting