JIRA:IPVSIX-29

Change-Id: I2f2f6d80f7f26e3a062bd09a8683aa03c9108925
Signed-off-by: Bin Hu <bh526r@att.com>

3 files changed, 15 insertions, 18 deletions

diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 295807a..c252b55 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -203,13 +203,11 @@ and ``eth1`` interface on ``ipv4-int-network1`` connecting to ``ipv4-router``.
     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:
+spawn a ``radvd``, and
 
-* Act as an IPv6 vRouter which advertises the RA (Router Advertisements) with prefix ``2001:db8:0:2::/64`` on its
-  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``.
+* Act as an IPv6 vRouter which advertises the RA (Router Advertisements) with prefix
+  ``2001:db8:0:2::/64`` on its internal interface (``eth1``).
+* Forward IPv6 traffic from internal interface (``eth1``)
 
 **SETUP-SVM-20**: Verify that ``Fedora22`` image boots up successfully and vRouter has ``ssh`` keys properly injected
 
@@ -293,14 +291,11 @@ interface of ``vRouter`` automatically configures an IPv6 SLAAC address.
 
     $radvd -C /opt/stack/opnfv_os_ipv6_poc/scenario2/radvd.conf -p /tmp/br-ex.pid.radvd -m syslog
 
-**SETUP-SVM-28**: Configure the ``$router_interface`` process entries to process the RA (Router Advertisement)
-message from ``vRouter``, and automatically add a downstream route pointing to the LLA (Link Local Address) of
-``eth0`` interface of the ``vRouter``.
+**SETUP-SVM-28**: Add an IPv6 downstream route pointing to the ``eth0`` interface of vRouter.
 
 .. code-block:: bash
 
-    sysctl -w net.ipv6.conf.$router_interface.accept_ra=2
-    sysctl -w net.ipv6.conf.$router_interface.accept_ra_rt_info_max_plen=64
+    ip -6 route add 2001:db8:0:2::/64 via 2001:db8:0:1:f816:3eff:fe11:1111
 
 **SETUP-SVM-29**: Please note that after the vRouter successfully initializes and starts sending RA (Router
 Advertisement) message, you would see an IPv6 route to the ``2001:db8:0:2::/64`` prefix
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 5a3f5bc..35045c9 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -12,7 +12,7 @@ For exemplary purpose, we assume:
 * The hostname of OpenStack Controller+Network+Compute 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``
-* Ubuntu 14.04 is installed
+* Ubuntu 14.04 or Fedora 21 is installed
 * We use ``opnfv`` as username to login.
 * We use ``devstack`` to install OpenStack Liberty. Please note that OpenStack Kilo can be used as well.
 
@@ -132,8 +132,9 @@ address of OpenStack Controller
 Please note that Security Groups feature has been disabled automatically through ``local.conf`` configuration file
 during the setup procedure of OpenStack in both Controller Node and Compute Node.
 
-If you are an experienced user that installs OpenStack in a different way, please reference the following
-instructions to verify that Security Groups are disabled, and configuration matches the note below.
+If you are an experienced user and installing OpenStack using a different installer (i.e. not with devstack),
+please make sure that Security Groups are disabled in the setup. You can verify that your setup has the following
+configuration parameters.
 
 **OS-NATIVE-SEC-1**: Change the settings in ``/etc/neutron/plugins/ml2/ml2_conf.ini`` as follows
 
diff --git a/docs/setupservicevm/scenario-2.rst b/docs/setupservicevm/scenario-2.rst
index 3ffe43c..25c9b91 100644
--- a/docs/setupservicevm/scenario-2.rst
+++ b/docs/setupservicevm/scenario-2.rst
@@ -2,10 +2,11 @@
 Scenario 2 - OpenStack + Open Daylight Lithium Official Release
 ===============================================================
 
-Scenario 2 is the environment of OpenStack + Open Daylight Lithium Official Release. Because Lithium Official
-Release does not support IPv6 L3 Routing, we need to enable Neutron L3 Agent instead of Open Daylight L3
-function, while we still use Open Daylight for L2 switching. Because there is a bug in net-virt provider
-implementation, we need to use manual configuration to simulate IPv6 external router in our setup.
+Scenario 2 is the environment of OpenStack + Open Daylight Lithium SR3 Official Release.
+Because Lithium SR3 Official Release does not support IPv6 L3 Routing, we need to enable
+Neutron L3 Agent instead of Open Daylight L3 function, while we still use Open Daylight for
+L2 switching. Because there is a bug in net-virt provider implementation, we need to use
+manual configuration to simulate IPv6 external router in our setup.
 
 Please note that although the instructions are based on OpenStack Kilo, they can be applied to Liberty in the same way.