summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2015-12-24 20:39:43 -0800
committerBin Hu <bh526r@att.com>2015-12-24 20:39:43 -0800
commit28ad68808e0ad96bbb3ae4adb2e5b63209f68275 (patch)
tree20f042d0191f9808eac9ef396cb770d9d0185857
parent723772199b008c7b6ac1957e861dc4573ac23cd5 (diff)
JIRA: IPVSIX-29
Change-Id: I25b0f02ea29b344b9f10eda397b19126795bc0eb Signed-off-by: Bin Hu <bh526r@att.com>
-rw-r--r--docs/setupservicevm/2-ipv6-configguide-os-controller.rst2
-rw-r--r--docs/setupservicevm/4-ipv6-configguide-servicevm.rst4
-rw-r--r--docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
index 3efa370..63265d9 100644
--- a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
@@ -12,7 +12,7 @@ For exemplary purpose, we assume:
* Ubuntu 14.04 or Fedora 21 is installed
* We use ``opnfv`` as username to login.
* We use ``devstack`` to install OpenStack Kilo. Please note that although the instructions are based on
-OpenStack Kilo, they can be applied to Liberty in the same way.
+OpenStack Kilo, they can be applied to Liberty in the same way.
**OS-N-0**: Login to OpenStack Controller Node with username ``opnfv``
diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 884f931..1fcfe90 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -193,7 +193,7 @@ and ``eth1`` interface on ``ipv4-int-network1`` connecting to ``ipv4-router``.
.. code-block:: bash
- nova boot --image Fedora22 --flavor m1.small --user-data /opt/stack/opnfv_os_ipv6_poc/metadata.txt --availability-zone nova:opnfv-os-compute --nic port-id=$(neutron port-list | grep -w eth0-vRouter | awk '{print $2}') --nic port-id=$(neutron port-list | grep -w eth1-vRouter | awk '{print $2}') --key-name vRouterKey vRouter
+ nova boot --image Fedora22 --flavor m1.small --user-data /opt/stack/opnfv_os_ipv6_poc/metadata.txt --availability-zone nova:opnfv-os-compute --nic port-id=$(neutron port-list | grep -w eth0-vRouter | awk '{print $2}') --nic port-id=$(neutron port-list | grep -w eth1-vRouter | awk '{print $2}') --key-name vRouterKey vRouter
Please **note** that ``/opt/stack/opnfv_os_ipv6_poc/metadata.txt`` is used to enable the ``vRouter`` to automatically
spawn a ``radvd``, and:
@@ -201,7 +201,7 @@ spawn a ``radvd``, and:
internal interface (``eth1``).
* Advertise RA (Router Advertisements) with just route information on its eth0 interface so that ``ipv6-router`` can
automatically add a downstream route to subnet ``2001:db8:0:2::/64`` whose next hop would be the ``eth0`` interface
-of ``vRouter``.
+of ``vRouter``.
**SETUP-SVM-20**: Verify that ``Fedora22`` image boots up successfully and vRouter has ``ssh`` keys properly injected
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 b6c92fc..625dc15 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -87,7 +87,7 @@ We assume the hostname is ``opnfv-os-compute``, and the host IP address is ``192
.. code-block:: bash
git clone https://github.com/openstack-dev/devstack.git -b stable/liberty
-
+
**OS-NATIVE-M-2**: Copy ``local.conf.compute`` to ``devstack`` as ``local.conf``
.. code-block:: bash