[ha-guide] Reorganize basic services content

To sync with installation guides.

Change-Id: Ia4df2bdb1f058bb3d8bcf035160463134d115384
Implements: blueprint improve-ha-guide

doc/ha-guide/source/controller-ha.rst

@@ -1,4 +1,3 @@
-
 ================================================
 Configuring the controller for high availability
 ================================================
@@ -12,9 +11,6 @@ and must talk to all other services.
    controller-ha-pacemaker.rst
    controller-ha-vip.rst
    controller-ha-haproxy.rst
-   controller-ha-galera.rst
    controller-ha-memcached.rst
-   controller-ha-rabbitmq.rst
    controller-ha-identity.rst
    controller-ha-telemetry.rst
-

doc/ha-guide/source/environment-hardware.rst

@@ -1,12 +1,19 @@
+=============================================
+Hardware considerations for high availability
+=============================================
+
+[TODO: Provide a minimal architecture example for HA,
+expanded on that given in
+http://docs.openstack.org/mitaka/install-guide-ubuntu/environment.html
+for easy comparison]
 
-==============
 Hardware setup
-==============
+~~~~~~~~~~~~~~
 
 The standard hardware requirements:
 
-- `Provider networks <http://docs.openstack.org/liberty/install-guide-ubuntu/overview.html#networking-option-1-provider-networks>`_
+- `Provider networks <http://docs.openstack.org/mitaka/install-guide-ubuntu/overview.html#networking-option-1-provider-networks>`_
-- `Self-service networks <http://docs.openstack.org/liberty/install-guide-ubuntu/overview.html#networking-option-2-self-service-networks>`_
+- `Self-service networks <http://docs.openstack.org/mitaka/install-guide-ubuntu/overview.html#networking-option-2-self-service-networks>`_
 
 However, OpenStack does not require a significant amount of resources
 and the following minimum requirements should support
@@ -44,4 +51,3 @@ for hardware acceleration of nested VMs.
    When installing highly-available OpenStack on VMs,
    be sure that your hypervisor permits promiscuous mode
    and disables MAC address filtering on the external network.
-

doc/ha-guide/source/environment-memcached.rst

@@ -1,4 +1,3 @@
-
 =================
 Install memcached
 =================

doc/ha-guide/source/environment.rst

@@ -0,0 +1,14 @@
+=======================================
+Basic environment for high availability
+=======================================
+
+This chapter describes the basic environment for high availability,
+such as hardware, operating system, common services.
+
+.. toctree::
+   :maxdepth: 2
+
+   environment-hardware.rst
+   environment-operatingsystem.rst
+   environment-ntp.rst
+   environment-memcached.rst

doc/ha-guide/source/hardware-ha.rst

@@ -1,15 +0,0 @@
-
-=============================================
-Hardware considerations for high availability
-=============================================
-
-[TODO: Provide a minimal architecture example for HA,
-expanded on that given in
-http://docs.openstack.org/liberty/install-guide-ubuntu/environment.html
-for easy comparison]
-
-
-.. toctree::
-   :maxdepth: 2
-
-   hardware-ha-basic.rst

doc/ha-guide/source/index.rst

@@ -25,8 +25,8 @@ Contents
 
    common/conventions.rst
    intro-ha.rst
-   hardware-ha.rst
+   environment.rst
-   install-ha.rst
+   shared-services.rst
    controller-ha.rst
    networking-ha.rst
    storage-ha.rst

doc/ha-guide/source/install-ha.rst

@@ -1,12 +0,0 @@
-=====================================
-Installing high availability packages
-=====================================
-
-[TODO -- write intro to this section]
-
-.. toctree::
-   :maxdepth: 2
-
-   install-ha-os.rst
-   install-ha-memcached.rst
-   install-ha-ntp.rst

doc/ha-guide/source/shared-database-configure.rst

@@ -1,3 +1,4 @@
+==============
 Configuration
 ==============
 

doc/ha-guide/source/shared-database-install.rst

@@ -1,5 +1,6 @@
+============
 Installation
-=============
+============
 
 Using Galera Cluster requires that you install two packages. The first is
 the database server, which must include the wsrep API patch. The second

doc/ha-guide/source/shared-database-manage.rst

@@ -1,5 +1,6 @@
+==========
 Management
-===========
+==========
 
 When you finish the installation and configuration process on each
 cluster node in your OpenStack database, you can initialize Galera Cluster.

doc/ha-guide/source/shared-database.rst

@@ -1,5 +1,6 @@
-Database (Galera Cluster)
+===============================================
-==========================
+Database (Galera Cluster) for high availability
+===============================================
 
 The first step is to install the database that sits at the heart of the
 cluster. To implement high availability, run an instance of the database on
@@ -28,6 +29,6 @@ replication system.
 .. toctree::
   :maxdepth: 2
 
-  controller-ha-galera-install
+  shared-database-install.rst
-  controller-ha-galera-config
+  shared-database-configure.rst
-  controller-ha-galera-manage
+  shared-database-manage.rst

doc/ha-guide/source/shared-messaging.rst

@@ -1,6 +1,6 @@
-========
+=======================================
-RabbitMQ
+Messaging service for high availability
-========
+=======================================
 
 An AMQP (Advanced Message Queuing Protocol) compliant message bus is
 required for most OpenStack components in order to coordinate the

doc/ha-guide/source/shared-services.rst

@@ -0,0 +1,12 @@
+=====================================
+Shared services for high availability
+=====================================
+
+This chapter describes the shared services for high availability,
+such as database, messaging service.
+
+.. toctree::
+   :maxdepth: 2
+
+   shared-database.rst
+   shared-messaging.rst