JIRA:IPVSIX-29

Change-Id: Ib542753d3c819a189170a8a582118354518adecc
Signed-off-by: Bin Hu <bh526r@att.com>
(cherry picked from commit 9fa2a90eb416cca5006503540004ea7e7cd29705)

7 files changed, 75 insertions, 36 deletions

diff --git a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
index 050be79..d9dc2f1 100644
--- a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
@@ -90,6 +90,9 @@ the existing codebase or update to the latest copy.
 
     opnfv@opnfv-os-controller:~/devstack$ source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **OS-N-10**: Verify some commands to check if setup is working fine.
 
 .. code-block:: bash
diff --git a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
index a27ae4c..04594c8 100644
--- a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
+++ b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
@@ -87,6 +87,9 @@ configuration parameters to determine if it has to run with the existing codebas
 
     opnfv@opnfv-os-compute:~/devstack$ source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **OS-M-9**: You can verify that OpenStack is set up correctly by showing hypervisor list
 
 .. code-block:: bash
diff --git a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
index 61412e1..8d0cd9c 100644
--- a/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/4-ipv6-configguide-servicevm.rst
@@ -30,6 +30,9 @@ Start a new terminal, and change directory to where OpenStack is installed.
 
     opnfv@opnfv-os-controller:~/devstack$ source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **************************************
 Add External Connectivity to ``br-ex``
 **************************************
@@ -38,6 +41,8 @@ Because we need to manually create networks/subnets to achieve the IPv6 vRouter,
 ``NEUTRON_CREATE_INITIAL_NETWORKS=False`` in ``local.conf`` file. When this flag is set to False,
 ``devstack`` does not create any networks/subnets during the setup phase.
 
+Now we have to move the public network from physical network interface to ``br-ex``,
+including moving the public IP address and setting up default route.
 In OpenStack Controller Node ``opnfv-os-controller``, ``eth1`` is configured to provide external/public connectivity
 for both IPv4 and IPv6 (optional). So let us add this interface to ``br-ex`` and move the IP address, including the
 default route from ``eth1`` to ``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 24899da..55dd241 100644
--- a/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
+++ b/docs/setupservicevm/5-ipv6-configguide-scenario-1-native-os.rst
@@ -158,18 +158,31 @@ configuration parameters.
     security_group_api = nova
     firewall_driver = nova.virt.firewall.NoopFirewallDriver
 
+**OS-NATIVE-SEC-3**: After updating the settings, you will have to restart the
+``Neutron`` and ``Nova`` services.
+
 *********************************
 Set Up Service VM as IPv6 vRouter
 *********************************
 
-**OS-NATIVE-SETUP-1**: Now we assume that OpenStack multi-node setup is up and running. The following
-commands should be executed:
+**OS-NATIVE-SETUP-1**: Now we assume that OpenStack multi-node setup is up and running.
+We have to source the tenant credentials in this step. The following commands should be executed
+in ``devstack``:
 
 .. code-block:: bash
 
+    # source the tenant credentials in devstack
     cd ~/devstack
     source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers. For example,
+the following command may be used for some other installers:
+
+    # source the tenant credentials in some other installers
+    source /opt/admin-openrc.sh
+
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **OS-NATIVE-SETUP-2**: Download ``fedora22`` image which would be used for ``vRouter``
 
 .. code-block:: bash
@@ -182,22 +195,10 @@ commands should be executed:
 
     glance image-create --name 'Fedora22' --disk-format qcow2 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
 
-**OS-NATIVE-SETUP-4**: Create Neutron routers ``ipv4-router`` and ``ipv6-router`` which need to provide external
-connectivity.
-
-.. code-block:: bash
-
-    neutron router-create ipv4-router
-    neutron router-create ipv6-router
-
-**OS-NATIVE-SETUP-5**: Create an external network/subnet ``ext-net`` using the appropriate values based on the
-data-center physical network setup.
-
-.. code-block:: bash
-
-    neutron net-create --router:external ext-net
+**OS-NATIVE-SETUP-4**: Now we have to move the public network from physical network
+interface to ``br-ex``, including moving the public IP address and setting up default route.
 
-**OS-NATIVE-SETUP-6**: If your ``opnfv-os-controller`` node has two interfaces ``eth0`` and ``eth1``,
+Because our ``opnfv-os-controller`` node has two interfaces ``eth0`` and ``eth1``,
 and ``eth1`` is used for external connectivity, move the IP address of ``eth1`` to ``br-ex``.
 
 Please note that the IP address ``198.59.156.113`` and related subnet and gateway addressed in the command
@@ -211,9 +212,8 @@ below are for exemplary purpose. **Please replace them with the IP addresses of
     sudo ip addr add 198.59.156.113/24 dev br-ex
     sudo ifconfig br-ex up
     sudo ip route add default via 198.59.156.1 dev br-ex
-    neutron subnet-create --disable-dhcp --allocation-pool start=198.59.156.251,end=198.59.156.254 --gateway 198.59.156.1 ext-net 198.59.156.0/24
 
-**OS-NATIVE-SETUP-7**: Verify that ``br-ex`` now has the original external IP address, and that the default route is on
+**OS-NATIVE-SETUP-5**: Verify that ``br-ex`` now has the original external IP address, and that the default route is on
 ``br-ex``
 
 .. code-block:: bash
@@ -234,6 +234,22 @@ below are for exemplary purpose. **Please replace them with the IP addresses of
 
 Please note that the IP addresses above are exemplary purpose.
 
+**OS-NATIVE-SETUP-6**: Create Neutron routers ``ipv4-router`` and ``ipv6-router`` which need to provide external
+connectivity.
+
+.. code-block:: bash
+
+    neutron router-create ipv4-router
+    neutron router-create ipv6-router
+
+**OS-NATIVE-SETUP-7**: Create an external network/subnet ``ext-net`` using the appropriate values based on the
+data-center physical network setup.
+
+.. code-block:: bash
+
+    neutron net-create --router:external ext-net
+    neutron subnet-create --disable-dhcp --allocation-pool start=198.59.156.251,end=198.59.156.254 --gateway 198.59.156.1 ext-net 198.59.156.0/24
+
 **OS-NATIVE-SETUP-8**: Create Neutron networks ``ipv4-int-network1`` and ``ipv6-int-network2``
 with port_security disabled
 
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 d1af395..37bbfcb 100644
--- a/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/scenario-3-2-ipv6-configguide-os-controller.rst
@@ -94,6 +94,9 @@ the existing codebase or update to the latest copy.
 
     opnfv@opnfv-os-controller:~/devstack$ source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **OS-N-10**: Verify some commands to check if setup is working fine.
 
 .. code-block:: bash
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 34af6b2..2f875ab 100644
--- a/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst
+++ b/docs/setupservicevm/scenario-3-3-ipv6-configguide-os-compute.rst
@@ -89,6 +89,9 @@ configuration parameters to determine if it has to run with the existing codebas
 
     opnfv@opnfv-os-compute:~/devstack$ source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **OS-M-9**: You can verify that OpenStack is set up correctly by showing hypervisor list
 
 .. code-block:: bash
diff --git a/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst b/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
index 6e673ca..6595cc6 100644
--- a/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
+++ b/docs/setupservicevm/scenario-3-4-ipv6-configguide-servicevm.rst
@@ -21,6 +21,9 @@ commands should be executed:
     cd ~/devstack
     source openrc admin demo
 
+Please **NOTE** that the method of sourcing tenant credentials may vary depending on installers.
+**Please refer to relevant documentation of installers if you encounter any issue**.
+
 **SCENARIO-3-SETUP-2**: Download ``fedora22`` image which would be used for ``vRouter``
 
 .. code-block:: bash
@@ -33,22 +36,10 @@ commands should be executed:
 
     glance image-create --name 'Fedora22' --disk-format qcow2 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
 
-**SCENARIO-3-SETUP-4**: Create Neutron routers ``ipv4-router`` and ``ipv6-router`` which need to provide external
-connectivity.
-
-.. code-block:: bash
-
-    neutron router-create ipv4-router
-    neutron router-create ipv6-router
-
-**SCENARIO-3-SETUP-5**: Create an external network/subnet ``ext-net`` using the appropriate values based on the
-data-center physical network setup.
-
-.. code-block:: bash
+**SCENARIO-3-SETUP-4**: Now we have to move the public network from physical network
+interface to ``br-ex``, including moving the public IP address and setting up default route.
 
-    neutron net-create --router:external ext-net
-
-**SCENARIO-3-SETUP-6**: If your ``opnfv-os-controller`` node has two interfaces ``eth0`` and ``eth1``,
+Because our ``opnfv-os-controller`` node has two interfaces ``eth0`` and ``eth1``,
 and ``eth1`` is used for external connectivity, move the IP address of ``eth1`` to ``br-ex``.
 
 Please note that the IP address ``198.59.156.113`` and related subnet and gateway addressed in the command
@@ -62,9 +53,8 @@ below are for exemplary purpose. **Please replace them with the IP addresses of
     sudo ip addr add 198.59.156.113/24 dev br-ex
     sudo ifconfig br-ex up
     sudo ip route add default via 198.59.156.1 dev br-ex
-    neutron subnet-create --disable-dhcp --allocation-pool start=198.59.156.251,end=198.59.156.254 --gateway 198.59.156.1 ext-net 198.59.156.0/24
 
-**SCENARIO-3-SETUP-7**: Verify that ``br-ex`` now has the original external IP address, and that the default route is on
+**SCENARIO-3-SETUP-5**: Verify that ``br-ex`` now has the original external IP address, and that the default route is on
 ``br-ex``
 
 .. code-block:: bash
@@ -85,6 +75,22 @@ below are for exemplary purpose. **Please replace them with the IP addresses of
 
 Please note that the IP addresses above are exemplary purpose.
 
+**SCENARIO-3-SETUP-6**: Create Neutron routers ``ipv4-router`` and ``ipv6-router`` which need to provide external
+connectivity.
+
+.. code-block:: bash
+
+    neutron router-create ipv4-router
+    neutron router-create ipv6-router
+
+**SCENARIO-3-SETUP-7**: Create an external network/subnet ``ext-net`` using the appropriate values based on the
+data-center physical network setup.
+
+.. code-block:: bash
+
+    neutron net-create --router:external ext-net
+    neutron subnet-create --disable-dhcp --allocation-pool start=198.59.156.251,end=198.59.156.254 --gateway 198.59.156.1 ext-net 198.59.156.0/24
+
 **SCENARIO-3-SETUP-8**: Create Neutron networks ``ipv4-int-network1`` and ``ipv6-int-network2``
 with port_security disabled