summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2015-12-25 00:05:58 -0800
committerBin Hu <bh526r@att.com>2015-12-25 00:05:58 -0800
commitb2bb6d595740c9d918cb07c296daf42d309f3afb (patch)
treef4e2791f80541ca43b1eded4840cddc6f4965289
parenta656b64800ee935870d8417ac72d3030aeb595bc (diff)
JIRA: IPVSIX-29
Change-Id: I987df1c97cfcfd56645b4fd40cfa634e0ff0f379 Signed-off-by: Bin Hu <bh526r@att.com>
-rw-r--r--docs/setupservicevm/1-ipv6-configguide-odl-setup.rst6
-rw-r--r--docs/setupservicevm/2-ipv6-configguide-os-controller.rst6
-rw-r--r--docs/setupservicevm/4-ipv6-configguide-servicevm.rst12
-rw-r--r--docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst4
4 files changed, 16 insertions, 12 deletions
diff --git a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
index d509de5..a70c596 100644
--- a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
+++ b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
@@ -1,6 +1,6 @@
-===================================
-Setting Up Open Daylight Controller
-===================================
+========================================
+Setting Up Open Daylight Controller Node
+========================================
For exemplary purpose, we assume:
diff --git a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
index ab7abc5..050be79 100644
--- a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
@@ -1,6 +1,6 @@
-===============================
-Setting Up OpenStack Controller
-===============================
+====================================
+Setting Up OpenStack Controller Node
+====================================
Please **note** that the instructions shown here are using ``devstack`` installer. If you are an experienced
user and installs OpenStack in a different way, you can skip this step and follow the instructions of the
diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 6104f49..2eacb60 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -4,9 +4,11 @@ Setting Up a Service VM as an IPv6 vRouter
Now we can start to set up a service VM as an IPv6 vRouter. For exemplary purpose, we assume:
-* The hostname of Open Daylight Controller Node is ``opnfv-odl-controller``
-* The hostname of OpenStack Controller Node is ``opnfv-os-controller``
-* The hostname of OpenStack Compute Node is ``opnfv-os-compute``
+* The hostname of Open Daylight Controller Node is ``opnfv-odl-controller``, and the host IP address is
+ ``192.168.0.30``
+* The hostname of OpenStack Controller Node is ``opnfv-os-controller``, and the host IP address
+ is ``192.168.0.10``
+* The hostname of OpenStack Compute Node is ``opnfv-os-compute``, and the host IP address is ``192.168.0.20``
* We use ``opnfv`` as username to login.
* We use ``devstack`` to install OpenStack Kilo, and the directory is ``~/devstack``
* Note: all IP addresses as shown below are for exemplary purpose.
@@ -53,9 +55,9 @@ default route from ``eth1`` to ``br-ex``.
Please note that:
-* Please note that the IP address ``198.59.156.113`` and related subnet and gateway addressed in the command
+* The IP address ``198.59.156.113`` and related subnet and gateway addressed in the command
below are for exemplary purpose. **Please replace them with the IP addresses of your actual network**.
-* **this can be automated in /etc/network/interfaces**.
+* **This can be automated in /etc/network/interfaces**.
**SETUP-SVM-4**: Verify that ``br-ex`` now has the original external IP address, and that the default route is on
``br-ex``
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 6f4aba2..5a3f5bc 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -95,7 +95,7 @@ We assume the hostname is ``opnfv-os-compute``, and the host IP address is ``192
cp /opt/stack/opnfv_os_ipv6_poc/local.conf.compute ~/devstack/local.conf
Please **note** that you need to change the IP address of ``SERVICE_HOST`` to point to your actual IP
-address of OpenStack Controller
+address of OpenStack Controller
**OS-NATIVE-M-3**: If you want to modify any ``devstack`` configuration, update ``local.conf`` now.
@@ -227,6 +227,8 @@ below are for exemplary purpose. **Please replace them with the IP addresses of
192.168.122.0/24 dev virbr0 proto kernel scope link src 192.168.122.1
198.59.156.0/24 dev br-ex proto kernel scope link src 198.59.156.113
+Please note that the IP addresses above are exemplary purpose.
+
**OS-NATIVE-SETUP-8**: Create Neutron networks ``ipv4-int-network1`` and ``ipv6-int-network2``
with port_security disabled