merge fixes

This commit is contained in:
Matthew Mosesohn 2013-10-14 10:53:23 +04:00
commit 8cb75eb604
13 changed files with 48 additions and 33 deletions

View File

@ -1,17 +0,0 @@
.. index Table of Contents
.. _ToC:
.. toctree:: Table of Contents
:maxdepth: 2
preface
.. include:: /pages/install-guide/0000-intro.rst
.. include:: /pages/install-guide/0060-download-fuel.rst
.. include:: /pages/install-guide/0015-sizing-hardware.rst
.. include:: /pages/install-guide/install.rst
.. include:: /pages/install-guide/networks.rst
.. include:: /pages/install-guide/0000-preamble.rst
.. include:: /pages/install-guide/0010-introduction.rst
.. include:: /pages/install-guide/0015-before-you-start.rst
.. include:: /pages/install-guide/0020-machines.rst

View File

@ -8,7 +8,7 @@ Documentation
=============================
.. toctree:: Documentation
:maxdepth: 2
:maxdepth: 3
install-guide
user-guide

View File

@ -5,7 +5,7 @@
.. toctree:: Table of Contents
:maxdepth: 2
preface
.. include:: /pages/preface/preface.rst
.. include:: /pages/install-guide/0000-intro.rst
.. include:: /pages/install-guide/0010-prerequisites.rst
.. include:: /pages/install-guide/0060-download-fuel.rst

View File

@ -1,11 +1,11 @@
.. index Table of Contents
.. _ToC:
.. _ReferenceArchitecture:
.. toctree:: Table of Contents
:maxdepth: 2
preface
.. include:: /pages/preface/preface.rst
.. include:: /pages/reference-architecture/0010-overview.rst
.. include:: /pages/reference-architecture/0012-simple.rst
.. include:: /pages/reference-architecture/0014-compact.rst

View File

@ -5,7 +5,7 @@
.. toctree:: Table of Contents
:maxdepth: 2
preface
.. include:: /pages/preface/preface.rst
.. include:: /pages/user-guide/0070-introduction.rst
.. include:: /pages/user-guide/red_hat_openstack.rst
.. include:: /pages/user-guide/post-install-healthchecks.rst

View File

@ -7,7 +7,7 @@ Installation Guide
.. contents:: :local:
:depth: 2
.. include:: /pages/install-guide/0000-intro.rst
.. include:: /pages/install-guide/0010-prerequisites.rst
.. include:: /pages/install-guide/0060-download-fuel.rst

View File

@ -21,9 +21,6 @@ clustered cloud in terms of minutes.
The following diagram describes how Fuel functions:
.. image:: /_images/how-it-works_svg.jpg
:align: center
Deployment Modes
-----------------------------
You can use Fuel™ for OpenStack to create virtually any OpenStack
@ -59,11 +56,36 @@ The pre-defined architectures include:
Ceph and Cinder servers, you can isolate their operations from
the controller nodes.
With Fuel, you can create your own cloud environment that include
additional components.
For more information, contact `Mirantis <http://www.mirantis.com/contact/>`_.
.. seealso:: `Reference Architecture <../html/reference-architecture.html>`_
.. seealso:: `Reference Architecture`
About Fuel Components
-----------------------
You can use Fuel to quickly deploy and manage the OpenStack environment.
Fuel includes the following components:
* **Master Node**
A controller node that manages the OpenStack environment including
deployment of additional controller and compute nodes, configuring
network settings, and so on. For HA deployments, Mirantis recommends
to deploy at least 3 controller nodes.
* **Compute Node(s)**
A compute node is a server where you run virtual machines and
applications.
* **Storage Node(s)**
Optional component. You can deploy a separate Swift storage node
Mirantis recommends to deploy standalone storage nodes for high
availability environments.
Fuel Installation Procedures
----------------------------
@ -74,6 +96,12 @@ You must complete the following tasks to install Fuel:
# Power on the other nodes to make them accessible for Fuel Master node
# Deploy the OpenStack environment on the discovered nodes using Fuel UI or CLI.
1. Install the Fuel Master Node on physical or virtual hardware using
the Fuel installation image
2. Power on the other nodes to make them accessible for Fuel Master node
3. Deploy the OpenStack environment on the discovered nodes using Fuel
UI or CLI.
Fuel is designed to maintain the OpenStack environment while providing
the flexibility to adapt it to your configuration.

View File

@ -1,4 +1,4 @@
..index:: Prerequisites
.. index:: Prerequisites
.. _Prerequisites:
@ -43,6 +43,8 @@ has the following prerequisites:
* 16 x Amazon EC2 compute units 16 GHz maximum
.. seealso:: `Fuel Hardware Calculator <https://www.mirantis.com/openstack-services/bom-calculator/>`_
Calculating CPU
----------------

View File

@ -9,7 +9,7 @@ Installing Fuel Master Node
.. contents :local:
Fuel is distributed via both ISO and IMG images. Eac contains an installer for
Fuel is distributed via both ISO and IMG images. Each contains an installer for
Fuel Master node. The ISO image is used for CD media devices, iLO (HP) or
similar remote access systems. The IMG file is used for USB memory stick-based
installation.
@ -60,6 +60,8 @@ installing OpenStack.
VirtualBox
----------
.. OpenStack-3.2-ReferenceArchitecture:
If you would like to evaluate Fuel on VirtualBox, you can take advantage of the
included set of scripts that create and configure all the required VMs for a
test environment, including the Master node and Slave nodes for OpenStack

View File

@ -26,5 +26,5 @@ The following table lists the released revisions of this documentation:
+--------------------+----------------------------+
|Revision Date |Description |
+====================+============================+
|September, 2013 |Testing Preface |
|October, 2013 |3.2 GA |
+--------------------+----------------------------+

View File

@ -4,7 +4,7 @@
.. cssclass:: header-table
+-------------------------------------+-----------------------------------+
| Fuel™ for Openstack v3.1 | .. cssclass:: right|
| Fuel™ for Openstack v3.2 | .. cssclass:: right|
| | |
| Installation Guide | ###Section### |
+-------------------------------------+-----------------------------------+

View File

@ -4,7 +4,7 @@
.. cssclass:: header-table
+-------------------------------------+-----------------------------------+
| Fuel™ for Openstack v3.1 | .. cssclass:: right|
| Fuel™ for Openstack v3.2 | .. cssclass:: right|
| | |
| Reference Architecture | ###Section### |
+-------------------------------------+-----------------------------------+

View File

@ -4,7 +4,7 @@
.. cssclass:: header-table
+-------------------------------------+-----------------------------------+
| Fuel™ for Openstack v3.1 | .. cssclass:: right|
| Fuel™ for Openstack v3.2 | .. cssclass:: right|
| | |
| User Guide | ###Section### |
+-------------------------------------+-----------------------------------+