From cd2bbfe1c929c3f64a087c7dd6c7acb1dea8fed1 Mon Sep 17 00:00:00 2001 From: Pavel Lechenko Date: Wed, 31 Jul 2013 21:40:32 +0400 Subject: [PATCH] Restructured all general topics --- ...000-introduction.rst => 0000-introduction.rst | 2 -- pages/0020-about-fuel.rst => 0020-about-fuel.rst | 0 ...0-release-notes.rst => 0030-release-notes.rst | 0 ...ecture.rst => 0040-reference-architecture.rst | 0 ...-fuel-ui.rst => 0045-installation-fuel-ui.rst | 0 ...uel-cli.rst => 0050-installation-fuel-cli.rst | 0 ...ons.rst => 0055-production-considerations.rst | 0 ...ration.rst => 0058-advanced-configuration.rst | 0 ...ns.rst => 0060-frequently-asked-questions.rst | 0 conf.py | 2 +- contents.rst | 16 ++++++++-------- pages/about-fuel/0040-reference-topologies.rst | 16 ++++++++-------- 12 files changed, 17 insertions(+), 19 deletions(-) rename pages/0000-introduction.rst => 0000-introduction.rst (99%) rename pages/0020-about-fuel.rst => 0020-about-fuel.rst (100%) rename pages/0030-release-notes.rst => 0030-release-notes.rst (100%) rename pages/0040-reference-architecture.rst => 0040-reference-architecture.rst (100%) rename pages/0045-installation-fuel-ui.rst => 0045-installation-fuel-ui.rst (100%) rename pages/0050-installation-fuel-cli.rst => 0050-installation-fuel-cli.rst (100%) rename pages/0055-production-considerations.rst => 0055-production-considerations.rst (100%) rename pages/0058-advanced-configuration.rst => 0058-advanced-configuration.rst (100%) rename pages/0060-frequently-asked-questions.rst => 0060-frequently-asked-questions.rst (100%) diff --git a/pages/0000-introduction.rst b/0000-introduction.rst similarity index 99% rename from pages/0000-introduction.rst rename to 0000-introduction.rst index 9c9894ce9..b82431a0a 100644 --- a/pages/0000-introduction.rst +++ b/0000-introduction.rst @@ -1,5 +1,3 @@ -.. index:: Introduction - ================================== Introduction to Fuel for OpenStack ================================== diff --git a/pages/0020-about-fuel.rst b/0020-about-fuel.rst similarity index 100% rename from pages/0020-about-fuel.rst rename to 0020-about-fuel.rst diff --git a/pages/0030-release-notes.rst b/0030-release-notes.rst similarity index 100% rename from pages/0030-release-notes.rst rename to 0030-release-notes.rst diff --git a/pages/0040-reference-architecture.rst b/0040-reference-architecture.rst similarity index 100% rename from pages/0040-reference-architecture.rst rename to 0040-reference-architecture.rst diff --git a/pages/0045-installation-fuel-ui.rst b/0045-installation-fuel-ui.rst similarity index 100% rename from pages/0045-installation-fuel-ui.rst rename to 0045-installation-fuel-ui.rst diff --git a/pages/0050-installation-fuel-cli.rst b/0050-installation-fuel-cli.rst similarity index 100% rename from pages/0050-installation-fuel-cli.rst rename to 0050-installation-fuel-cli.rst diff --git a/pages/0055-production-considerations.rst b/0055-production-considerations.rst similarity index 100% rename from pages/0055-production-considerations.rst rename to 0055-production-considerations.rst diff --git a/pages/0058-advanced-configuration.rst b/0058-advanced-configuration.rst similarity index 100% rename from pages/0058-advanced-configuration.rst rename to 0058-advanced-configuration.rst diff --git a/pages/0060-frequently-asked-questions.rst b/0060-frequently-asked-questions.rst similarity index 100% rename from pages/0060-frequently-asked-questions.rst rename to 0060-frequently-asked-questions.rst diff --git a/conf.py b/conf.py index bfa9d2d63..900c3252e 100644 --- a/conf.py +++ b/conf.py @@ -74,7 +74,7 @@ release = '3.1' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. -exclude_patterns = ['_build'] +exclude_patterns = ['_*', "pages"] # The reST default role (used for this markup: `text`) to use for all documents. #default_role = None diff --git a/contents.rst b/contents.rst index b05973173..a856f7130 100644 --- a/contents.rst +++ b/contents.rst @@ -10,12 +10,12 @@ Table of Contents :maxdepth: 2 index - pages/0010-package-contents - pages/0020-about-fuel - pages/0030-release-notes - pages/0040-reference-architecture - pages/0045-installation-fuel-ui - pages/0050-installation-fuel-cli - pages/0055-production-considerations - pages/0060-frequently-asked-questions + 0010-package-contents + 0020-about-fuel + 0030-release-notes + 0040-reference-architecture + 0045-installation-fuel-ui + 0050-installation-fuel-cli + 0055-production-considerations + 0060-frequently-asked-questions copyright diff --git a/pages/about-fuel/0040-reference-topologies.rst b/pages/about-fuel/0040-reference-topologies.rst index 74a9d9909..62df3215c 100644 --- a/pages/about-fuel/0040-reference-topologies.rst +++ b/pages/about-fuel/0040-reference-topologies.rst @@ -12,14 +12,14 @@ its constituent components are tailored to one or more common cloud use cases. Fuel provides the ability to create the following cluster types without requiring extensive customization: -.. index:: Deployment Configurations, Single node +.. index:: Deployment Configurations; Single node **Single node**: Perfect for getting a feel for how OpenStack works, the Single-node installation is the simplest way to get OpenStack up and running. The Single-node installation provides an easy way to install an entire OpenStack cluster on a single physical server system or in a virtual machine environment. -.. index:: Deployment Configurations, Multi-node (non-HA) +.. index:: Deployment Configurations; Multi-node (non-HA) **Multi-node (non-HA)**: The Multi-node (non-HA) installation enables you to try out additional OpenStack services like Cinder, Neutron (formerly Quantum), and @@ -27,18 +27,18 @@ Swift without requiring the degree of increased hardware involved in ensuring high availability. In addition to the ability to independently specify which services to activate, you also have the following options: - .. index:: Deployment Configurations, Compact Swift non-HA + .. index:: Deployment Configurations; Compact Swift non-HA **Compact Swift**: When you choose this option, Swift will be installed on your controllers, reducing your hardware requirements by eliminating the need for additional Swift servers. - .. index:: Deployment Configurations, Standalone Swift non-HA + .. index:: Deployment Configurations; Standalone Swift non-HA **Standalone Swift**: This option enables you to install independant Swift nodes, so that you can separate their operation from your controller nodes. -.. index:: Deployment Configurations, Multi-node (HA) +.. index:: Deployment Configurations; Multi-node (HA) **Multi-node (HA)**: When you're ready to begin your move to production, the Multi-node (HA) configuration is a straightforward way to create an OpenStack @@ -46,19 +46,19 @@ cluster that provides high availability. With three controller nodes and the ability to individually specify services such as Cinder, Neutron, and Swift, Fuel provides the following variations of the Multi-node (HA) configuration: - .. index:: Deployment Configurations, Compact Swift HA + .. index:: Deployment Configurations; Compact Swift HA **Compact Swift**: When you choose this option, Swift will be installed on your controllers, reducing your hardware requirements by eliminating the need for additional Swift servers while still addressing high availability requirements. - .. index:: Deployment Configurations, Standalone Swift HA + .. index:: Deployment Configurations; Standalone Swift HA **Standalone Swift**: This option enables you to install independant Swift nodes, so that you can separate their operation from your controller nodes. - .. index:: Deployment Configurations, Compact Neutron HA + .. index:: Deployment Configurations; Compact Neutron HA **Compact Neutron**: If you don't need the flexibility of a separate Neutron node, Fuel provides the option to combine your Neutron node with one of your