From 28b80a08cf843f509346bfb67d732c605540d4f6 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Mon, 12 Sep 2016 12:12:34 -0700
Subject: [PATCH] Revert "Build a more organized doc structure"
Our philosophy document is one of our most important documents
in he documentation repository. I appreciate in general the notion
of reorganizing many of our docs, but this one should be left alone
and possibly protected by a roll-call vote in the future.
This reverts commit aa517c4bf965f06dc9bcb20220d675ff6e77e94c.
Change-Id: Ic17861e823095a1891ac25ddaf429b66e352e30e
---
...mplating.rst => deployment-philosophy.rst} | 26 ++++++++++--
.../deployment-philosophy.rst | 40 -------------------
.../templating-and-customization.rst | 0
doc/index.rst | 6 +--
4 files changed, 25 insertions(+), 47 deletions(-)
rename doc/{deployment-philosophy/templating.rst => deployment-philosophy.rst} (71%)
delete mode 100644 doc/deployment-philosophy/deployment-philosophy.rst
delete mode 100644 doc/deployment-philosophy/templating-and-customization.rst
diff --git a/doc/deployment-philosophy/templating.rst b/doc/deployment-philosophy.rst
similarity index 71%
rename from doc/deployment-philosophy/templating.rst
rename to doc/deployment-philosophy.rst
index c0511c7a28..6711d34f0c 100644
--- a/doc/deployment-philosophy/templating.rst
+++ b/doc/deployment-philosophy.rst
@@ -1,8 +1,26 @@
-.. _templating:
+.. _deployment-philosophy:
-================
-Kolla Templating
-================
+=============================
+Kolla's Deployment Philosophy
+=============================
+
+Overview
+========
+
+Kolla has an objective to replace the inflexible, painful, resource-intensive
+deployment process of OpenStack with a flexible, painless, inexpensive
+deployment process. Often to deploy OpenStack at the 100+ node scale small
+businesses may require means building a team of OpenStack professionals to
+maintain and manage the OpenStack deployment. Finding people experienced in
+OpenStack deployment is very difficult and expensive, resulting in a big
+barrier for OpenStack adoption. Kolla seeks to remedy this set of problems by
+simplifying the deployment process while enabling flexible deployment models.
+
+Kolla is a highly opinionated deployment tool out of the box. This permits
+Kolla to be deployable with the simple configuration of three key/value pairs.
+As an operator's experience with OpenStack grows and the desire to customize
+OpenStack services increases, Kolla offers full capability to override every
+OpenStack service configuration option in the deployment.
Why not Template Customization?
===============================
diff --git a/doc/deployment-philosophy/deployment-philosophy.rst b/doc/deployment-philosophy/deployment-philosophy.rst
deleted file mode 100644
index 00cbfea260..0000000000
--- a/doc/deployment-philosophy/deployment-philosophy.rst
+++ /dev/null
@@ -1,40 +0,0 @@
-.. _deployment-philosophy:
-
-=============================
-Kolla's Deployment Philosophy
-=============================
-
-Overview
-========
-
-Kolla has an objective to replace the inflexible, painful, resource-intensive
-deployment process of OpenStack with a flexible, painless, inexpensive
-deployment process. Often to deploy OpenStack at the 100+ node scale small
-businesses may require means building a team of OpenStack professionals to
-maintain and manage the OpenStack deployment. Finding people experienced in
-OpenStack deployment is very difficult and expensive, resulting in a big
-barrier for OpenStack adoption. Kolla seeks to remedy this set of problems by
-simplifying the deployment process but enabling flexible deployment models.
-
-Kolla is a highly opinionated deployment tool out of the box. This permits
-Kolla to be deployable with the simple configuration of three key/value pairs.
-As an operator's experience with OpenStack grows and the desire to customize
-OpenStack services increases, Kolla offers full capability to override every
-OpenStack service configuration option in the deployment.
-
-Templating and Customization Philosophy
-=======================================
-
-To read up on the Kolla communities template philosphy go to the
-:doc:`templating` doc.
-
-Architecture
-============
-
-#TODO: Link an image showing the architecture
-
-
-.. toctree::
- :hidden:
-
- templating
diff --git a/doc/deployment-philosophy/templating-and-customization.rst b/doc/deployment-philosophy/templating-and-customization.rst
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/doc/index.rst b/doc/index.rst
index a5a10b7c71..ae313d412a 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -34,14 +34,14 @@ Kolla Overview
==============
.. toctree::
- :maxdepth: 2
+ :maxdepth: 1
- deployment-philosophy/deployment-philosophy
- architecture-guide
+ deployment-philosophy
quickstart
multinode
image-building
advanced-configuration
+ architecture-guide
operating-kolla
security
--
GitLab