Merge "[Docs] Move AIO to first scenario"

README.rst

@@ -49,7 +49,7 @@ https://git.openstack.org/cgit/openstack/openstack-ansible-<ROLENAME>.
 .. _official OpenStack project: https://governance.openstack.org/reference/projects/index.html
 .. _Home Page: https://governance.openstack.org/reference/projects/openstackansible.html
 .. _Deployment Guide: https://docs.openstack.org/project-deploy-guide/openstack-ansible/latest
-.. _Quick Start: https://docs.openstack.org/openstack-ansible/latest/contributor/quickstart-aio.html
+.. _Quick Start: https://docs.openstack.org/openstack-ansible/latest/user/aio/quickstart.html
 .. _Developer Documentation: https://docs.openstack.org/openstack-ansible/latest/contributor/index.html
 .. _Source: https://git.openstack.org/cgit/openstack/openstack-ansible
 .. _OpenStack Mailing Lists: http://lists.openstack.org/

deploy-guide/source/index.rst

@@ -9,7 +9,7 @@ intended for deployers.
 .. note::
 
    If you want to do a quick proof of concept of OpenStack, read the
-   `All-In-One quickstart Guide <https://docs.openstack.org/openstack-ansible/latest/contributor/quickstart-aio.html>`_
+   `All-In-One quickstart Guide <https://docs.openstack.org/openstack-ansible/latest/user/aio/quickstart.html>`_
    instead of this document. This document is a walkthrough of a deploy
    using OpenStack-Ansible, with all its configurability.
 

doc/source/conf.py

@@ -29,7 +29,7 @@ import sys
 
 # Create dynamic table file.
 CONF_PATH = os.path.dirname(os.path.realpath(__file__))
-SCENARIO_TABLE = 'contributor/scenario-table-gen.html'
+SCENARIO_TABLE = 'user/aio/scenario-table-gen.html'
 TABLE_FILE = os.path.join(CONF_PATH, SCENARIO_TABLE)
 stg = imp.load_source(
     'scenario_table_gen',

doc/source/contributor/index.rst

@@ -24,7 +24,6 @@ Contents:
 .. toctree::
    :maxdepth: 2
 
-   quickstart-aio
    inventory-and-vars
    scripts
    contribute

doc/source/contributor/scripts.rst

@@ -51,13 +51,12 @@ arguments to ``ansible-playbook`` as a convenience.
 bootstrap-aio.sh
 ----------------
 
-The ``bootstrap-aio.sh`` script prepares a host for an `All-In-One`_ (AIO)
+The ``bootstrap-aio.sh`` script prepares a host for an
+:ref:`All-In-One <quickstart-aio>` (AIO)
 deployment for the purposes of development and gating. The script creates the
 necessary partitions, directories, and configurations. The script can be
 configured using environment variables - more details are provided on the
-`All-In-One`_ page.
-
-.. _All-In-One: quickstart-aio.html
+:ref:`All-In-One <quickstart-aio>` page.
 
 Development and Testing
 ^^^^^^^^^^^^^^^^^^^^^^^

doc/source/user/aio/quickstart.rst

@@ -1,6 +1,8 @@
-===========
-Quick Start
-===========
+.. _quickstart-aio:
+
+===============
+Quickstart: AIO
+===============
 
 All-in-one (AIO) builds are a great way to perform an OpenStack-Ansible build
 for:
@@ -234,6 +236,7 @@ Keystone service, execute:
 
 Rebooting an AIO
 ----------------
+
 As the AIO includes all three cluster members of MariaDB/Galera, the cluster
 has to be re-initialized after the host is rebooted.
 
@@ -251,6 +254,7 @@ section in the operations guide.
 
 Rebuilding an AIO
 -----------------
+
 Sometimes it may be useful to destroy all the containers and rebuild the AIO.
 While it is preferred that the AIO is entirely destroyed and rebuilt, this
 isn't always practical. As such the following may be executed instead:

doc/source/user/index.rst

@@ -18,3 +18,8 @@ see the :dev_docs:`Contributors Guide <contributor/index.html>`.
 
 For in-depth technical information, see the
 :dev_docs:`OpenStack-Ansible Reference <reference/index.html>`.
+
+.. toctree::
+   :maxdepth: 1
+
+   aio/quickstart.rst