Add HA section

Change-Id: I984d7444102064744f2136bdb2bfe5c80ccda362

deploy-guide/source/app-ha.rst

@@ -1,8 +1,6 @@
-.. _ha:
+================================
-
+Infrastructure high availability
-=======================================
+================================
-Appendix T: OpenStack high availability
-=======================================
 
 Overview
 --------

deploy-guide/source/app-managing-power-events.rst

@@ -62,7 +62,7 @@ some such applications may still require attention when starting back up. The
 Cloud applications are typically made highly available through the use of the
 `hacluster`_ subordinate charm. Some applications, though, achieve HA at the
 software layer (outside of Juju), and can be called *natively HA*. One such
-application is ``rabbitmq-server``. See :doc:`OpenStack high availability
+application is ``rabbitmq-server``. See :doc:`Infrastructure high availability
 <app-ha>` for more information.
 
 Cloud topology

deploy-guide/source/app-masakari.rst

@@ -1,6 +1,6 @@
-====================
+==========================
-Appendix L: Masakari
+Instance high availability
-====================
+==========================
 
 Overview
 --------
@@ -100,8 +100,8 @@ bundle.
 Provide values for the ``maas_url``, ``maas_credentials``, and ``vip``
 hacluster charm options . A VIP is a virtual IP needed for Masakari to enable
 HA (a requirement when using the masakari charm). If multiple networks are
-used, multiple (space separated) VIPs should be provided. See `OpenStack high
+used, multiple (space separated) VIPs should be provided. See `Infrastructure
-availability`_ for HA guidance.
+high availability`_ for HA guidance.
 
 Enable STONITH via the ``enable-stonith`` pacemaker-remote charm option.
 
@@ -506,6 +506,6 @@ Masakari.
 .. _MAAS: https://maas.io
 .. _Masakari charm: http://jaas.ai/masakari
 .. _openstack-base: https://jaas.ai/openstack-base
-.. _OpenStack high availability: app-ha.html#ha-applications
+.. _Infrastructure high availability: app-ha.html#ha-applications
 .. _Configure OpenStack: configure-openstack.html
 .. _deploying OpenStack: install-openstack.html

deploy-guide/source/app-ovn.rst

@@ -73,8 +73,8 @@ components as a principle charm through the use of the
 High availability
 -----------------
 
-OVN is HA by design; take a look at the `OVN section of the OpenStack high
+OVN is HA by design; take a look at the `OVN section of the Infrastructure high
-availability`_ appendix.
+availability`_ page.
 
 Configuration
 -------------
@@ -1011,7 +1011,7 @@ Perform migration
 .. _ovn-chassis charm: https://jaas.ai/u/openstack-charmers/ovn-chassis/
 .. _OpenStack Base bundle: https://github.com/openstack-charmers/openstack-bundles/tree/master/development/openstack-base-bionic-ussuri-ovn
 .. _gaps from ML2/OVS: https://docs.openstack.org/neutron/latest/ovn/gaps.html
-.. _OVN section of the OpenStack high availability: app-ha#ovn
+.. _OVN section of the Infrastructure high availability: app-ha#ovn
 .. _OpenStack Charms Deployment Guide: https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/
 .. _Nova config drive: https://docs.openstack.org/nova/latest/user/metadata.html#config-drives
 .. _DPDK supported hardware page: http://core.dpdk.org/supported/

deploy-guide/source/index.rst

@@ -63,6 +63,13 @@ contribution`_.
    app-octavia
    app-bridge-interface-configuration
 
+.. toctree::
+   :caption: High availability
+   :maxdepth: 1
+
+   app-ha
+   app-masakari
+
 .. toctree::
    :caption: Appendices
    :maxdepth: 1
@@ -72,12 +79,9 @@ contribution`_.
    Ceph erasure coding <app-erasure-coding>
    Ceph RADOS Gateway multisite replication <app-rgw-multisite>
    Ceph RBD mirroring <app-ceph-rbd-mirror>
-   Ceph charm deprecation <app-ceph-migration>
-   Masakari <app-masakari>
    Managing power events <app-managing-power-events>
    Manila Ganesha <app-manila-ganesha>
    Swift usage <app-swift>
-   High availability <app-ha>
    TrilioVault Data Protection <app-trilio-vault>
 
 .. LINKS

deploy-guide/source/install-openstack.rst

@@ -45,7 +45,7 @@ documentation before continuing:
    Cloud topology section goes here (modelled on openstack-base README)
 
 This page will show how to install a minimal non-HA OpenStack cloud. See
-:doc:`OpenStack high availability <app-ha>` for guidance on that subject.
+:doc:`Infrastructure high availability <app-ha>` for guidance on that subject.
 
 OpenStack release
 -----------------

deploy-guide/source/upgrade-series-openstack.rst

@@ -788,8 +788,8 @@ ensuring the availability of services.
    is deployed with ``customize-failure-domain`` set to 'true' and the ceph-osd
    units are hosted on machines in three or more separate Juju AZs you can
    safely reboot ceph-osd machines concurrently in the same zone. See
-   :ref:`Ceph AZ <ceph_az>` in :doc:`OpenStack high availability <app-ha>` for
+   :ref:`Ceph AZ <ceph_az>` in :doc:`Infrastructure high availability <app-ha>`
-   details.
+   for details.
 
 Automation
 ----------