From dc60f9186cbd63bb3b96f22276cc218a286aad33 Mon Sep 17 00:00:00 2001 From: Bin Hu Date: Fri, 8 Jan 2016 23:26:18 -0800 Subject: JIRA:IPVSIX-29 Change-Id: Ia9a9eae8987bd4ee84c01b405ccd985e2e4735e2 Signed-off-by: Bin Hu (cherry picked from commit f890f738bba19aaeb1db1ef4023e802072ca3414) --- docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst | 4 ++-- docs/setupservicevm/index.rst | 1 + docs/setupservicevm/scenario-3-0-ipv6-configguide-prep-infra.rst | 2 +- docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst | 2 +- docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst index d222c63..24899da 100644 --- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst +++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst @@ -22,9 +22,9 @@ For exemplary purpose, we assume: Underlay Network Topology - Scenario 1 -**Please note that:** +**Please NOTE that:** -* **the IP address shown in** :numref:`s1-figure1` **are for exemplary purpose. +* **The IP address shown in** :numref:`s1-figure1` **are for exemplary purpose. You need to configure your public IP address connecting to Internet according to your actual network infrastructure. And you need to make sure the private IP address are not conflicting with other subnets**. diff --git a/docs/setupservicevm/index.rst b/docs/setupservicevm/index.rst index f498138..d60b172 100644 --- a/docs/setupservicevm/index.rst +++ b/docs/setupservicevm/index.rst @@ -33,6 +33,7 @@ nodes are used, the setup procedure is the same. In particular: ``ipv6-router`` is created in order to manually spawn ``radvd`` daemon inside the ``ipv6-router`` namespace in steps **SETUP-SVM-24** through **SETUP-SVM-30**. + .. toctree:: :numbered: :maxdepth: 4 diff --git a/docs/setupservicevm/scenario-3-0-ipv6-configguide-prep-infra.rst b/docs/setupservicevm/scenario-3-0-ipv6-configguide-prep-infra.rst index a407c27..5db060c 100644 --- a/docs/setupservicevm/scenario-3-0-ipv6-configguide-prep-infra.rst +++ b/docs/setupservicevm/scenario-3-0-ipv6-configguide-prep-infra.rst @@ -7,7 +7,7 @@ each of which has minimum 8GB RAM and 40GB storage. One host is used as OpenStac Node. The second host is used as Open Daylight Controller Node. And the third one is used as OpenStack Compute Node. -** Please NOTE that Although the deployment model of single controller node is assumed, in case of HA +**Please NOTE that Although the deployment model of single controller node is assumed, in case of HA (High Availability) deployment model where multiple controller nodes are used, there is no impact and the setup procedure is the same.** diff --git a/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst index 60af9f4..d1af395 100644 --- a/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst +++ b/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst @@ -59,7 +59,7 @@ For **Fedora**: Please **note** that: * Note 1: Because Scenario 3 and Scenario 2 are essentially the same, and their only difference - is using different build of Open Daylight, they share the same ``local.conf``` file of OpenStack. + is using different build of Open Daylight, they share the same ``local.conf`` file of OpenStack. * Note 2: You need to change the IP address of ``ODL_MGR_IP`` to point to your actual IP address of Open Daylight Controller. diff --git a/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst b/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst index 88a66cd..34af6b2 100644 --- a/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst +++ b/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst @@ -59,7 +59,7 @@ For **Fedora**: Please Note: * Note 1: Because Scenario 3 and Scenario 2 are essentially the same, and their only difference - is using different build of Open Daylight, they share the same ``local.conf``` file of OpenStack. + is using different build of Open Daylight, they share the same ``local.conf`` file of OpenStack. * Note 2: you need to change the IP address of ``SERVICE_HOST`` to point to your actual IP address of OpenStack Controller. * Note 3: you need to change the IP address of ``ODL_MGR_IP`` to point to your actual IP address -- cgit 1.2.3-korg