move project-install-guide under /install

Change-Id: I39cabc18e40eee968309b63de3d74e3e828645d9
Signed-off-by: Doug Hellmann <doug@doughellmann.com>

doc/arch-design/source/index.rst

@@ -35,7 +35,7 @@ Before reading this book, we recommend:
 * A basic understanding of networking principles and protocols.
 
 For information about deploying and operating OpenStack, see the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata/>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 `Deployment Guides <https://docs.openstack.org/ocata/deploy/>`_,
 and the `OpenStack Operations Guide <https://docs.openstack.org/ops-guide/>`_.
 

doc/contributor-guide/source/project-install-guide.rst

@@ -149,7 +149,6 @@ After these changes have merged, you can set up the jobs for building.
 #. Commit the changes to the infra repository for review.
 
 To create or update the master index file, create or update the
-``www/project-install-guide/RELEASE/index.html`` file and the
+``www/RELEASE/install/index.html`` file and the
 ``doc/install-guide/source/additional-services.rst`` at the
 ``openstack-manuals`` repository.
-For draft (unreleased) version, replace ``RELEASE`` with ``draft``.

doc/ha-guide-draft/source/compute-node-ha.rst

@@ -3,7 +3,7 @@ Configuring the compute node
 ============================
 
 The `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_
+<https://docs.openstack.org/ocata/install/>`_
 provide instructions for installing multiple compute nodes.
 To make the compute nodes highly available, you must configure the
 environment to include multiple instances of the API and other services.

doc/ha-guide-draft/source/intro-os-ha-memcached.rst

@@ -31,5 +31,5 @@ By default, ``controller1`` handles the caching service. If the host goes down,
 
 For more information about Memcached installation, see the
 *Environment -> Memcached* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_
 depending on your distribution.

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

@@ -4,7 +4,7 @@ Configuring the networking services
 
 Configure networking on each node. See the basic information about
 configuring networking in the Networking service section of the
-`Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata/>`_,
+`Install Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 OpenStack network nodes contain:

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

@@ -16,7 +16,7 @@ Prerequisites
 Before beginning, ensure that you are familiar with the
 documentation for installing the OpenStack Image API service.
 See the *Image service* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install>`_,
 depending on your distribution.
 
 .. _glance-api-pacemaker:

doc/ha-guide/source/compute-node-ha.rst

@@ -3,7 +3,7 @@ Configuring the compute node
 ============================
 
 The `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_
+<https://docs.openstack.org/ocata/install/>`_
 provide instructions for installing multiple compute nodes.
 To make the compute nodes highly available, you must configure the
 environment to include multiple instances of the API and other services.

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

@@ -12,11 +12,11 @@ The following are the standard hardware requirements:
 
 - Provider networks: See the *Overview -> Networking Option 1: Provider
   networks* section of the
-  `Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+  `Install Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
   depending on your distribution.
 - Self-service networks: See the *Overview -> Networking Option 2:
   Self-service networks* section of the
-  `Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+  `Install Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
   depending on your distribution.
 
 OpenStack does not require a significant amount of resources and the following

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

@@ -28,5 +28,5 @@ By default, ``controller1`` handles the caching service. If the host goes down,
 
 For more information about Memcached installation, see the
 *Environment -> Memcached* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_
 depending on your distribution.

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

@@ -7,4 +7,4 @@ We recommend that you configure the controller node to reference
 more accurate (lower stratum) servers and other nodes to reference
 the controller node. For more information, see the
 `Installation Tutorials and Guides
-<https://docs.openstack.org/project-install-guide/ocata/>`_.
+<https://docs.openstack.org/ocata/install/>`_.

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

@@ -5,7 +5,7 @@ Installing the operating system
 The first step in setting up your highly available OpenStack cluster
 is to install the operating system on each node.
 Follow the instructions in the *Environment* section of the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install>`_
 depending on your distribution.
 
 The OpenStack Installation Tutorials and Guides also include a list of

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

@@ -11,7 +11,7 @@ Configuring the networking services
 Configure networking on each node. See the basic information
 about configuring networking in the *Networking service*
 section of the
-`Install Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Install Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 OpenStack network nodes contain:

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

@@ -16,7 +16,7 @@ Prerequisites
 Before beginning, ensure that you are familiar with the
 documentation for installing the OpenStack Image API service.
 See the *Image service* section in the
-`Installation Tutorials and Guides <https://docs.openstack.org/project-install-guide/ocata>`_,
+`Installation Tutorials and Guides <https://docs.openstack.org/ocata/install/>`_,
 depending on your distribution.
 
 .. _glance-api-pacemaker:

doc/install-guide/source/environment.rst

@@ -9,7 +9,7 @@ Although most environments include Identity, Image service, Compute, at least
 one networking service, and the Dashboard, the Object Storage service can
 operate independently. If your use case only involves Object Storage, you can
 skip to `Object Storage Installation Guide
-<https://docs.openstack.org/project-install-guide/object-storage/draft/>`_
+<https://docs.openstack.org/swift/>`_
 after configuring the appropriate nodes for it.
 
 You must use an account with administrative privileges to configure each node.

doc/install-guide/source/launch-instance.rst

@@ -219,7 +219,7 @@ If your environment includes the Orchestration service, you can create
 a stack that launches an instance.
 
 For more information, see the
-`Orchestration installation guide <https://docs.openstack.org/project-install-guide/orchestration/ocata/launch-instance.html>`_.
+`Orchestration installation guide <https://docs.openstack.org/orchestration/>`_.
 
 Shared File Systems
 -------------------
@@ -229,4 +229,4 @@ a share and mount it in an instance.
 
 For more information, see the
 `Shared File Systems installation guide
-<https://docs.openstack.org/project-install-guide/shared-file-systems/ocata>`_.
+<https://docs.openstack.org/shared-file-system/>`_.

www/.htaccess

@@ -68,6 +68,10 @@ redirectmatch 301 "^/project-deploy-guide/openstack-ansible/$" /project-deploy-g
 redirectmatch 301 "^/project-deploy-guide/newton/" /newton/deploy/
 redirectmatch 301 "^/project-deploy-guide/ocata/" /ocata/deploy/
 
+# Redirect old install guide list pages to their new home
+redirectmatch 301 "^/project-install-guide/newton/" /newton/install/
+redirectmatch 301 "^/project-install-guide/ocata/(.*)$" /ocata/install/$1
+
 # Redirecting infra docs links to new developer location
 redirectmatch 301 "^/infra/shade(.*)$" /developer/shade$1
 

www/ocata/index.html

@@ -62,7 +62,7 @@
                 <div class="docs-link-sections">
                     <h3 id="install-guides"><i class="fa fa-cogs"></i> Installation Tutorials and Guides</h3>
                     <p>Getting started with the most commonly used OpenStack services</p>
-                    <a href="/project-install-guide/ocata/">Installation Tutorials and Guides</a>
+                    <a href="install">Installation Tutorials and Guides</a>
                 </div>
                 <div class="docs-link-sections">
                     <h3 id="project-deploy-guide"><i class="fa fa-cogs"></i> Deployment Guides</h3>