summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bh526r@att.com>2015-12-22 17:09:05 -0800
committerBin Hu <bh526r@att.com>2015-12-22 17:09:05 -0800
commit7b80890e0e1eed715badfcb852084976449bcafe (patch)
tree1790ed0e5e5c58b1d7de17e87e379f534d8091c3
parent2467725e0e98ed44f579839ceaf4399d646d9f57 (diff)
JIRA: IPVSIX-29
Change-Id: Ie13afaeb1502b900c06ba7f2bb92c490af6d5c32 Signed-off-by: Bin Hu <bh526r@att.com>
-rw-r--r--docs/setupservicevm/0-ipv6-configguide-prep-infra.rst2
-rw-r--r--docs/setupservicevm/1-ipv6-configguide-odl-setup.rst37
-rw-r--r--docs/setupservicevm/2-ipv6-configguide-os-controller.rst19
-rw-r--r--docs/setupservicevm/3-ipv6-configguide-os-compute.rst20
4 files changed, 41 insertions, 37 deletions
diff --git a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
index a134b7b..4c2287a 100644
--- a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
+++ b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
@@ -35,7 +35,7 @@ The underlay network topology of those 3 hosts are shown as follows in :numref:`
Underlay Network Topology
-**Please note that the IP address shown in** ``:numref:`figure2```
+**Please note that the IP address shown in** :numref:`figure2`
**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
diff --git a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
index 0a77f08..6c142c6 100644
--- a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
+++ b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
@@ -30,16 +30,25 @@ Node. The objective is to allow all connections on the internal
private network (ens160). The same objective can be achieved using
firewalld as well. **If you intend to use firewalld, please skip this step and directly go to next step**:
-| ``sudo systemctl stop firewalld.service``
-| ``sudo yum remove -y firewalld``
-| ``sudo yum install -y iptables-services``
-| ``sudo touch /etc/sysconfig/iptables``
-| ``sudo systemctl enable iptables.service``
-| ``sudo systemctl start iptables.service``
-| ``sudo iptables -I INPUT 1 -i ens160 -j ACCEPT``
-| ``# For ODL DLUX UI``
-| ``sudo iptables -I INPUT -m state --state NEW -p tcp --dport 8181 -j ACCEPT``
-| ``sudo iptables-save > /etc/sysconfig/iptables``
+ ``sudo systemctl stop firewalld.service``
+
+ ``sudo yum remove -y firewalld``
+
+ ``sudo yum install -y iptables-services``
+
+ ``sudo touch /etc/sysconfig/iptables``
+
+ ``sudo systemctl enable iptables.service``
+
+ ``sudo systemctl start iptables.service``
+
+ ``sudo iptables -I INPUT 1 -i ens160 -j ACCEPT``
+
+ ``# For ODL DLUX UI``
+
+ ``sudo iptables -I INPUT -m state --state NEW -p tcp --dport 8181 -j ACCEPT``
+
+ ``sudo iptables-save > /etc/sysconfig/iptables``
**ODL-6**: Open a screen session.
@@ -69,7 +78,8 @@ feature.
**ODL-11**: Verify that OVSDB feature is installed successfully.
-| ``opendaylight-user@opnfv>feature:list -i | grep ovsdb``
+ ``opendaylight-user@opnfv>feature:list -i | grep ovsdb``
+
| odl-ovsdb-openstack | 1.1.1-Lithium-SR1 | x | ovsdb-1.1.1-Lithium-SR1 | OpenDaylight :: OVSDB :: OpenStack Network Virtual
| odl-ovsdb-southbound-api | 1.1.1-Lithium-SR1 | x | odl-ovsdb-southbound-1.1.1-Lithium-SR1 | OpenDaylight :: southbound :: api
| odl-ovsdb-southbound-impl | 1.1.1-Lithium-SR1 | x | odl-ovsdb-southbound-1.1.1-Lithium-SR1 | OpenDaylight :: southbound :: impl
@@ -79,8 +89,9 @@ feature.
**ODL-12**: To view the logs, you can use the following commands (or alternately the file data/log/karaf.log).
-| ``opendaylight-user@opnfv>log:display``
-| ``opendaylight-user@opnfv>log:tail``
+ ``opendaylight-user@opnfv>log:display``
+
+ ``opendaylight-user@opnfv>log:tail``
**ODL-13**: To enable ODL DLUX UI, install the following features.
Then you can navigate to
diff --git a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
index b5a3a6b..fc8b208 100644
--- a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
@@ -13,8 +13,9 @@ For exemplary purpose, we assume:
**OS-N-2**: Update the packages and install git
-| ``sudo apt-get update -y``
-| ``sudo apt-get install -y git``
+ ``sudo apt-get update -y``
+
+ ``sudo apt-get install -y git``
**OS-N-3**: Download devstack and switch to stable/kilo branch
@@ -28,12 +29,9 @@ For exemplary purpose, we assume:
``http://fpaste.org/276949/39476214/``
- **Note 1**: you need to change the IP address of ``ODL_MGR_IP`` to
-point to your actual IP address of Open Daylight Controller.
+ **Note 1**: you need to change the IP address of ``ODL_MGR_IP`` to point to your actual IP address of Open Daylight Controller.
- **Note 2**: You may have to change the value of
-``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your
-actual network interfaces.
+ **Note 2**: You may have to change the value of ``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your actual network interfaces.
**OS-N-6**: Initiate Openstack setup by invoking ``stack.sh``
@@ -43,14 +41,13 @@ actual network interfaces.
that the IP addresses are all for the purpose of example. Your IP addresses will match the ones
of your actual network interfaces.
-| ``This is your host ip: <opnfv-os-controller IP address>``
+ ``This is your host ip: <opnfv-os-controller IP address>``
| ``Horizon is now available at http://<opnfv-os-controller IP address>/``
| ``Keystone is serving at http://<opnfv-os-controller IP address>:5000/``
| ``The default users are: admin and demo``
| ``The password: password``
-**OS-N-8**: Assuming that all goes well, you can set ``OFFLINE=True`` and ``RECLONE=no`` in ``local.conf`` to lock the
-codebase. Devstack uses these configuration parameters to determine if it has to run with the existing codebase or
+**OS-N-8**: Assuming that all goes well, you can set ``OFFLINE=True`` and ``RECLONE=no`` in ``local.conf`` to lock the codebase. Devstack uses these configuration parameters to determine if it has to run with the existing codebase or
update to the latest copy.
**OS-N-9**: Source the credentials.
@@ -59,7 +56,7 @@ update to the latest copy.
**OS-N-10**: Verify some commands to check if setup is working fine.
-| ``opnfv@opnfv-os-controller:~/devstack$ nova flavor-list``
+ ``opnfv@opnfv-os-controller:~/devstack$ nova flavor-list``
| +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+
| | ID | Name | Memory_MB | Disk | Ephemeral | Swap | VCPUs | RXTX_Factor | Is_Public |
| +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+
diff --git a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
index 84768f0..e70840f 100644
--- a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
+++ b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
@@ -13,8 +13,9 @@ For exemplary purpose, we assume:
**OS-M-2**: Update the packages and install git
-| ``sudo apt-get update -y``
-| ``sudo apt-get install -y git``
+ ``sudo apt-get update -y``
+
+ ``sudo apt-get install -y git``
**OS-M-3**: Download devstack and switch to stable/kilo branch
@@ -28,22 +29,17 @@ For exemplary purpose, we assume:
``http://fpaste.org/276958/44395955/``
- **Note 1**: you need to change the IP address of ``SERVICE_HOST`` to
-point to your actual IP address of OpenStack Controller.
+ **Note 1**: you need to change the IP address of ``SERVICE_HOST`` to point to your actual IP address of OpenStack Controller.
- **Note 2**: you need to change the IP address of ``ODL_MGR_IP`` to
-point to your actual IP address of Open Daylight Controller.
+ **Note 2**: you need to change the IP address of ``ODL_MGR_IP`` to point to your actual IP address of Open Daylight Controller.
- **Note 3**: You may have to change the value of
-``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your
-actual network interface.
+ **Note 3**: You may have to change the value of ``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your actual network interface.
**OS-M-6**: Initiate Openstack setup by invoking ``stack.sh``
``./stack.sh``
-**OS-M-7**: Assuming that all goes well, you can set ``OFFLINE=True`` and ``RECLONE=no`` in ``local.conf`` to lock the
-codebase. Devstack uses these configuration parameters to determine if it has to run with the existing codebase or
+**OS-M-7**: Assuming that all goes well, you can set ``OFFLINE=True`` and ``RECLONE=no`` in ``local.conf`` to lock the codebase. Devstack uses these configuration parameters to determine if it has to run with the existing codebase or
update to the latest copy.
**OS-M-8**: Source the credentials.
@@ -52,7 +48,7 @@ update to the latest copy.
**OS-M-9**: Verify some commands to check if setup is working fine.
-| ``opnfv@opnfv-os-controller:~/devstack$ nova flavor-list``
+ ``opnfv@opnfv-os-controller:~/devstack$ nova flavor-list``
| +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+
| | ID | Name | Memory_MB | Disk | Ephemeral | Swap | VCPUs | RXTX_Factor | Is_Public |
| +----+-----------+-----------+------+-----------+------+-------+-------------+-----------+