From aa0dc40713b97a874b885d0f689d767e7f2f96ad Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Wed, 30 Nov 2016 02:31:58 +0000 Subject: [PATCH] Tricircle document improvement 1. What is the problem Original multi-node-installation-devstack.rst is for multi pod installation guide. Original single-node-installation-devstack.rst is for single pod installation guide. The file name is changed for clear instruction. 2. What is the solution to the problem file name is changed and file content is also updated. 3. What the features need to be implemented to the Tricircle N/A Closes-Bug: #1645940 Change-Id: I9e542dc2927c5ff0876accb1aaf1c1917713b3e1 Signed-off-by: Guo Ruijing --- ...k.rst => multi-pod-installation-devstack.rst} | 16 ++++++++-------- ....rst => single-pod-installation-devstack.rst} | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) rename doc/source/{multi-node-installation-devstack.rst => multi-pod-installation-devstack.rst} (97%) rename doc/source/{single-node-installation-devstack.rst => single-pod-installation-devstack.rst} (94%) diff --git a/doc/source/multi-node-installation-devstack.rst b/doc/source/multi-pod-installation-devstack.rst similarity index 97% rename from doc/source/multi-node-installation-devstack.rst rename to doc/source/multi-pod-installation-devstack.rst index 74ed036d..04de2a39 100644 --- a/doc/source/multi-node-installation-devstack.rst +++ b/doc/source/multi-pod-installation-devstack.rst @@ -1,19 +1,19 @@ -===================================== -Multi-node Installation with DevStack -===================================== +==================================== +Multi-pod Installation with DevStack +==================================== Introduction ^^^^^^^^^^^^ -In the single node installation guide, we discuss how to deploy the Tricircle in -one single node with DevStack. Besides the Tricircle API and the central Neutron +In the single pod installation guide, we discuss how to deploy the Tricircle in +one single pod with DevStack. Besides the Tricircle API and the central Neutron server, only one pod(one pod means one OpenStack instance) is running. Network is created with the default network type: local. Local type network will be only presented in one pod. If a local type network is already hosting virtual machines in one pod, you can not use it to boot virtual machine in another pod. That is to say, local type network doesn't support cross-pod l2 networking. -With multi-node installation of the Tricircle, you can try out cross-pod l2 +With multi-pod installation of the Tricircle, you can try out cross-pod l2 networking and cross-pod l3 networking features. As the first step to support cross-pod l2 networking, we have added shared VLAN @@ -83,7 +83,7 @@ for installing DevStack in virtual machine. Setup ^^^^^ -In node1, +In pod1 in node1, - 1 Install DevStack. Please refer to `DevStack document `_ @@ -132,7 +132,7 @@ In node1, - 6 After DevStack successfully starts, begin to setup node2. -In node2, +In pod2 in node2, - 1 Install DevStack. Please refer to `DevStack document `_ diff --git a/doc/source/single-node-installation-devstack.rst b/doc/source/single-pod-installation-devstack.rst similarity index 94% rename from doc/source/single-node-installation-devstack.rst rename to doc/source/single-pod-installation-devstack.rst index 05aa8bbd..1165b7af 100644 --- a/doc/source/single-node-installation-devstack.rst +++ b/doc/source/single-pod-installation-devstack.rst @@ -1,9 +1,9 @@ -====================================== -Single node installation with DevStack -====================================== +===================================== +Single pod installation with DevStack +===================================== -Now the Tricircle can be played with all-in-one single node DevStack. For -the resource requirement to setup single node DevStack, please refer +Now the Tricircle can be played with all-in-one single pod DevStack. For +the resource requirement to setup single pod DevStack, please refer to `All-In-One Single Machine `_ for installing DevStack in physical machine or `All-In-One Single VM `_ for