From dcd8735e3132188da43a46652a16f59daf48f2e5 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@openstack.org>
Date: Thu, 15 Oct 2015 16:15:37 +0800
Subject: [PATCH] Liberty release updates

With the release of liberty, some links in this guide
needed to be updated. Where possible, links were updated
to liberty. Since the guide appears to rely on the older
3-node architecture, some links have only been updated to
the kilo release (which is the same as Juno).

Change-Id: Ifc2ea3ea926dff139b9ea93e4919ee0876bace54
---
 doc/ha-guide/source/compute-node-ha-api.rst    | 2 +-
 doc/ha-guide/source/controller-ha-keystone.rst | 2 +-
 doc/ha-guide/source/hardware-ha-basic.rst      | 4 ++--
 doc/ha-guide/source/hardware-ha.rst            | 2 +-
 doc/ha-guide/source/networking-ha.rst          | 2 +-
 doc/ha-guide/source/storage-ha-glance.rst      | 5 -----
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/doc/ha-guide/source/compute-node-ha-api.rst b/doc/ha-guide/source/compute-node-ha-api.rst
index 228fe87b..bad60bd4 100644
--- a/doc/ha-guide/source/compute-node-ha-api.rst
+++ b/doc/ha-guide/source/compute-node-ha-api.rst
@@ -4,7 +4,7 @@ Configure high availability on compute nodes
 ============================================
 
 The `Installation Guide
-<http://docs.openstack.org/juno/install-guide/install/apt/content/ch_nova.html>`_
+<http://docs.openstack.org/liberty/#install-guides>`_
 gives instructions for installing multiple compute nodes.
 To make them highly available,
 you must configure the envirionment
diff --git a/doc/ha-guide/source/controller-ha-keystone.rst b/doc/ha-guide/source/controller-ha-keystone.rst
index 4b0a09c9..b4278a73 100644
--- a/doc/ha-guide/source/controller-ha-keystone.rst
+++ b/doc/ha-guide/source/controller-ha-keystone.rst
@@ -7,7 +7,7 @@ OpenStack Identity (keystone)
 is the Identity service in OpenStack that is used by many services.
 You should be familiar with
 `OpenStack identity concepts
-<http://docs.openstack.org/juno/install-guide/install/apt/content/keystone-concepts.html>`_
+<http://docs.openstack.org/liberty/install-guide-ubuntu/common/get_started_identity.html>`_
 before proceeding.
 
 Making the OpenStack Identity service highly available
diff --git a/doc/ha-guide/source/hardware-ha-basic.rst b/doc/ha-guide/source/hardware-ha-basic.rst
index 4552e5db..dde092b4 100644
--- a/doc/ha-guide/source/hardware-ha-basic.rst
+++ b/doc/ha-guide/source/hardware-ha-basic.rst
@@ -5,8 +5,8 @@ Hardware setup
 
 The standard hardware requirements:
 
-- `neutron <http://docs.openstack.org/juno/install-guide/install/apt/content/ch_overview.html#example-architecture-with-neutron-networking-hw>`_
-- `nova-network <http://docs.openstack.org/juno/install-guide/install/apt/content/ch_overview.html#example-architecture-with-legacy-networking-hw>`_
+- `neutron <http://docs.openstack.org/kilo/install-guide/install/apt/content/ch_overview.html#example-architecture-with-neutron-networking-hw>`_
+- `nova-network <http://docs.openstack.org/kilo/install-guide/install/apt/content/ch_overview.html#example-architecture-with-legacy-networking-hw>`_
 
 However, OpenStack does not require a significant amount of resources
 and the following minimum requirements should support
diff --git a/doc/ha-guide/source/hardware-ha.rst b/doc/ha-guide/source/hardware-ha.rst
index 1461b945..91c03fc8 100644
--- a/doc/ha-guide/source/hardware-ha.rst
+++ b/doc/ha-guide/source/hardware-ha.rst
@@ -5,7 +5,7 @@ Hardware considerations for high availability
 
 [TODO: Provide a minimal architecture example for HA,
 expanded on that given in
-http://docs.openstack.org/juno/install-guide/install/apt/content/ch_basic_environment.html#basics-prerequisites
+http://docs.openstack.org/liberty/install-guide-ubuntu/environment.html
 for easy comparison]
 
 
diff --git a/doc/ha-guide/source/networking-ha.rst b/doc/ha-guide/source/networking-ha.rst
index 6835e391..cbfa8252 100644
--- a/doc/ha-guide/source/networking-ha.rst
+++ b/doc/ha-guide/source/networking-ha.rst
@@ -4,7 +4,7 @@ OpenStack network nodes
 =======================
 
 Configure networking on each node.
-The `Networking <http://docs.openstack.org/juno/install-guide/install/apt/content/ch_basic_environment.html#basics-prerequisites>`_
+The `Networking <http://docs.openstack.org/liberty/install-guide-ubuntu/environment.html>`_
 section of the *Install Guide* includes basic information
 about configuring networking.
 
diff --git a/doc/ha-guide/source/storage-ha-glance.rst b/doc/ha-guide/source/storage-ha-glance.rst
index 6cdbb392..b82fdb7f 100644
--- a/doc/ha-guide/source/storage-ha-glance.rst
+++ b/doc/ha-guide/source/storage-ha-glance.rst
@@ -116,11 +116,6 @@ you would use the following configuration in your :file:`nova.conf` file:
    ...
 
 
-.. note::
-
-         In releases prior to Juno, this option was called
-         ``glance_api_servers`` and located in the [DEFAULT] section.
-
 You must also create the OpenStack Image API endpoint with this IP address.
 If you are using both private and public IP addresses,
 you should create two Virtual IP addresses