From 078120b5dfed8973702a8ef714010918610e9736 Mon Sep 17 00:00:00 2001
From: Shuquan Huang <huang.shuquan@99cloud.net>
Date: Mon, 26 Oct 2015 22:26:09 +0800
Subject: [PATCH] Fix node arch and install Guide links in HA Guide Hardware
 setup

The 'neutron' and 'nova-network' links point to the Kilo version of the
Install Guide, as the hardware setup is based around that 3-node
architecture.
The Liberty Install Guide now uses a 2-node architecture. The HA Guide
should be updated to reflect this 2-node architecture, and these two
links should be updated to the Liberty Install Guide.

Change-Id: I36a0fd0605ee9c8837c1f66318550e82c3f74fa2
Closes-bug: #1506374
---
 doc/ha-guide/source/hardware-ha-basic.rst | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/doc/ha-guide/source/hardware-ha-basic.rst b/doc/ha-guide/source/hardware-ha-basic.rst
index dde092b4..31669dc6 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/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>`_
+- `Provider networks <http://docs.openstack.org/liberty/install-guide-ubuntu/overview.html#networking-option-1-provider-networks>`_
+- `Self-service networks <http://docs.openstack.org/liberty/install-guide-ubuntu/overview.html#networking-option-2-self-service-networks>`_
 
 However, OpenStack does not require a significant amount of resources
 and the following minimum requirements should support
@@ -15,15 +15,13 @@ with core services and several instances:
 
 [TODO: Verify that these numbers are good]
 
-+-------------------+------------+----------+---------+
-| Node type         | Processor  | Memory   | Storage |
-+===================+============+==========+=========+
-| controller node   | 3          | 2 GB     | 5 GB    |
-+-------------------+------------+----------+---------+
-| network node      | 3          | 512 MB   | 5 GB    |
-+-------------------+------------+----------+---------+
-| compute node      | 3          | 2 GB     | 10 GB   |
-+-------------------+------------+----------+---------+
++-------------------+------------+----------+-----------+------+
+| Node type         | Processor  | Memory   | Storage   | NIC  |
++===================+============+==========+===========+======+
+| controller node   | 1-2        | 8 GB     | 100 GB    | 2    |
++-------------------+------------+----------+-----------+------+
+| compute node      | 2-4+       | 8+ GB    | 100+ GB   | 2    |
++-------------------+------------+----------+-----------+------+
 
 
 For demonstrations and studying,