[ha-guide] consolidate service names

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

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

@@ -1,23 +1,20 @@
+=============================
+Highly available Identity API
+=============================
 
-============================
-Identity services (keystone)
-============================
-
-OpenStack Identity (keystone)
-is the Identity service in OpenStack that is used by many services.
 You should be familiar with
-`OpenStack identity concepts
+`OpenStack Identity service
-<http://docs.openstack.org/liberty/install-guide-ubuntu/common/get_started_identity.html>`_
+<http://docs.openstack.org/admin-guide/common/get_started_identity.html>`_
-before proceeding.
+before proceeding, which is used by many services.
 
 Making the OpenStack Identity service highly available
 in active / passive mode involves:
 
-- :ref:`keystone-pacemaker`
+- :ref:`identity-pacemaker`
-- :ref:`keystone-config-identity`
+- :ref:`identity-config-identity`
-- :ref:`keystone-services-config`
+- :ref:`identity-services-config`
 
-.. _keystone-pacemaker:
+.. _identity-pacemaker:
 
 Add OpenStack Identity resource to Pacemaker
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -66,7 +63,7 @@ Add OpenStack Identity resource to Pacemaker
    Pacemaker then starts the OpenStack Identity service
    and its dependent resources on one of your nodes.
 
-.. _keystone-config-identity:
+.. _identity-config-identity:
 
 Configure OpenStack Identity service
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -97,7 +94,7 @@ Configure OpenStack Identity service
       ...
 
 
-.. _keystone-services-config:
+.. _identity-services-config:
 
 Configure OpenStack services to use the highly available OpenStack Identity
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -1,9 +1,10 @@
+==============================
+Highly available Telemetry API
+==============================
 
-=========
+`Telemetry service
-Telemetry
+<http://docs.openstack.org/admin-guide/common/get_started_telemetry.html`>_
-=========
+provides data collection service and alarming service.
-
-[TODO (Add Telemetry overview)]
 
 Telemetry central agent
 ~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -15,6 +15,6 @@ and must talk to all other services.
    controller-ha-galera.rst
    controller-ha-memcached.rst
    controller-ha-rabbitmq.rst
-   controller-ha-keystone.rst
+   controller-ha-identity.rst
    controller-ha-telemetry.rst
 

doc/ha-guide/source/index.rst

@@ -27,8 +27,8 @@ Contents
    intro-ha.rst
    hardware-ha.rst
    install-ha.rst
-   networking-ha.rst
    controller-ha.rst
+   networking-ha.rst
    storage-ha.rst
    compute-node-ha.rst
    noncore-ha.rst

doc/ha-guide/source/networking-ha-dhcp.rst

@@ -1,9 +1,6 @@
-
+=========================
-.. _dhcp-agent:
+Run Networking DHCP agent
-
+=========================
-======================
-Run neutron DHCP agent
-======================
 
 The OpenStack Networking service has a scheduler
 that lets you run multiple agents across nodes;
@@ -14,4 +11,3 @@ in the :file:`/etc/neutron/neutron.conf` file.
 By default this is set to 1.
 To achieve high availability,
 assign more than one DHCP agent per network.
-

doc/ha-guide/source/networking-ha-l3.rst

@@ -1,9 +1,6 @@
-
+=======================
-.. _neutron-l3:
+Run Networking L3 agent
-
+=======================
-====================
-Run neutron L3 agent
-====================
 
 The neutron L3 agent is scalable, due to the scheduler that supports
 Virtual Router Redundancy Protocol (VRRP)
@@ -33,5 +30,3 @@ to set the following values:
      - Minimum number of network nodes to use for the HA router.
        A new router can be created only if this number
        of network nodes are available.
-
-

doc/ha-guide/source/networking-ha-lbaas.rst

@@ -1,9 +1,6 @@
-
+==========================
-.. _neutron-lbaas:
+Run Networking LBaaS agent
-
+==========================
-=======================
-Run neutron LBaaS agent
-=======================
 
 Currently, no native feature is provided
 to make the LBaaS agent highly available
@@ -14,4 +11,3 @@ Unfortunately, this is not yet implemented
 in the LBaaS HAProxy plug-in.
 
 [TODO: update this section.]
-

doc/ha-guide/source/networking-ha-metadata.rst

@@ -1,9 +1,6 @@
-
+=============================
-.. _neutron-metadata:
+Run Networking metadata agent
-
+=============================
-==========================
-Run neutron metadata agent
-==========================
 
 No native feature is available
 to make this service highly available.
@@ -15,4 +12,3 @@ in failover mode with Pacemaker.
 Can this service now be made HA in active/active mode
 or do we need to pull in the instructions
 to run this service in active/passive mode?]
-

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

@@ -1,11 +1,10 @@
-
+=========================================
-=======================
+Networking services for high availability
-OpenStack network nodes
+=========================================
-=======================
 
 Configure networking on each node.
 The
-`Networking <http://docs.openstack.org/liberty/install-guide-ubuntu/environment-networking.html>`_
+`Networking <http://docs.openstack.org/mitaka/install-guide-ubuntu/environment-networking.html>`_
 section of the *Install Guide* includes basic information
 about configuring networking.
 
@@ -33,16 +32,16 @@ are related.]
 
 OpenStack network nodes contain:
 
-- :ref:`Neutron DHCP agent<dhcp-agent>`
+- :doc:`Networking DHCP agent<networking-ha-dhcp>`
-- Neutron L2 agent.
+- Networking L2 agent.
   Note that the L2 agent cannot be distributed and highly available.
   Instead, it must be installed on each data forwarding node
   to control the virtual network drivers
   such as Open vSwitch or Linux Bridge.
   One L2 agent runs per node and controls its virtual interfaces.
-- :ref:`Neutron L3 agent<neutron-l3>`
+- :doc:`Neutron L3 agent<networking-ha-l3>`
-- :ref:`Neutron metadata agent<neutron-metadata>`
+- :doc:`Neutron metadata agent<networking-ha-metadata>`
-- :ref:`Neutron LBaaS<neutron-lbaas>` (Load Balancing as a Service) agent
+- :doc:`Neutron LBaaS agent<networking-ha-lbaas>`
 
 .. note::
 
@@ -57,4 +56,3 @@ OpenStack network nodes contain:
    networking-ha-l3.rst
    networking-ha-metadata.rst
    networking-ha-lbaas.rst
-

doc/ha-guide/source/storage-ha-block.rst

@@ -1,6 +1,3 @@
-.. highlight: ini
-   :linenothreshold: 5
-
 ==================================
 Highly available Block Storage API
 ==================================
@@ -16,9 +13,9 @@ also has volume snapshots capability for backing up the volumes.
 Making this Block Storage API service highly available in
 active/passive mode involves:
 
-- :ref:`ha-cinder-pacemaker`
+- :ref:`ha-blockstorage-pacemaker`
-- :ref:`ha-cinder-configure`
+- :ref:`ha-blockstorage-configure`
-- :ref:`ha-cinder-services`
+- :ref:`ha-blockstorage-services`
 
 In theory, you can run the Block Storage service as active/active.
 However, because of sufficient concerns, it is recommended running
@@ -67,7 +64,7 @@ and there is a
 for addressing them upstream.
 
 
-.. _ha-cinder-pacemaker:
+.. _ha-blockstorage-pacemaker:
 
 Add Block Storage API resource to Pacemaker
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -133,7 +130,7 @@ by entering :command:`commit` from the :command:`crm configure` menu.
 Pacemaker then starts the Block Storage API service
 and its dependent resources on one of your nodes.
 
-.. _ha-cinder-configure:
+.. _ha-blockstorage-configure:
 
 Configure Block Storage API service
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -212,7 +209,7 @@ be filled in for you, resulting in a shorter configuration file:
 Replace ``CINDER_DBPASS`` with the password you chose for the Block Storage
 database.
 
-.. _ha-cinder-services:
+.. _ha-blockstorage-services:
 
 Configure OpenStack services to use highly available Block Storage API
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/ha-guide/source/storage-ha-file-systems.rst

@@ -1,6 +1,3 @@
-.. highlight: ini
-   :linenothreshold: 5
-
 ========================================
 Highly available Shared File Systems API
 ========================================
@@ -8,11 +5,11 @@ Highly available Shared File Systems API
 Making the Shared File Systems (manila) API service highly available
 in active/passive mode involves:
 
-- :ref:`ha-manila-pacemaker`
+- :ref:`ha-sharedfilesystems-pacemaker`
-- :ref:`ha-manila-configure`
+- :ref:`ha-sharedfilesystems-configure`
-- :ref:`ha-manila-services`
+- :ref:`ha-sharedfilesystems-services`
 
-.. _ha-manila-pacemaker:
+.. _ha-sharedfilesystems-pacemaker:
 
 Add Shared File Systems API resource to Pacemaker
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -53,7 +50,7 @@ from the :command:`crm configure` menu. Pacemaker then starts the
 Shared File Systems API service and its dependent resources on one of your
 nodes.
 
-.. _ha-manila-configure:
+.. _ha-sharedfilesystems-configure:
 
 Configure Shared File Systems API service
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -74,7 +71,7 @@ Edit the :file:`/etc/manila/manila.conf` file:
    rabbit_host = 10.0.0.11
 
 
-.. _ha-manila-services:
+.. _ha-sharedfilesystems-services:
 
 Configure OpenStack services to use HA Shared File Systems API
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/ha-guide/source/storage-ha-image.rst

@@ -1,6 +1,6 @@
-====================================
+==========================
-Highly available OpenStack Image API
+Highly available Image API
-====================================
+==========================
 
 The OpenStack Image service offers a service for discovering,
 registering, and retrieving virtual machine images.

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

@@ -5,9 +5,7 @@ Configuring Storage for high availability
 .. toctree::
    :maxdepth: 2
 
-   storage-ha-cinder.rst
+   storage-ha-image.rst
-   storage-ha-glance.rst
+   storage-ha-block.rst
-   storage-ha-manila.rst
+   storage-ha-file-systems.rst
    storage-ha-backend.rst
-
-