Add zte-pod2 info in documents

Update the documents structure to describe 2 PODs in ZTE NJ Pharos Lab:
Update the template;
Update zte-pod1 informaton;
Add zte-pod2 information;
Add zte-nj.rst into index.rst

JIRA: PHAROS-235

Change-Id: Ib06e2d0c247a260e4c64909b90d2b33b32bc9dc6
Signed-off-by: Julien-zte <zhang.jun3g@zte.com.cn>
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

1 files changed, 35 insertions, 16 deletions

diff --git a/docs/labs/zte-nj-lab/lab_description.rst b/docs/labs/zte-nj-lab/lab_description.rst
index b63148ca..0bb74933 100644
--- a/docs/labs/zte-nj-lab/lab_description.rst
+++ b/docs/labs/zte-nj-lab/lab_description.rst
@@ -4,31 +4,46 @@
 
 .. _pharos_lab:
 
-**************************
+************************
 ZTE NJ Lab Specification
-**************************
+************************
+
 
 Introduction
 ------------
 
-ZTE lab currently has one POD available in Nanjing. The POD have 5 hosts, 3 controller+2 computer.
-It focuses on fuel project CI-related activities.
+ZTE NJ Pharos lab currently has two PODs available in Nanjing. Each POD has 5 servers, 3 controller
+nodes and 2 computer nodes. They are dedicatedly used for CI. These PODs focus scenarios related
+with **test** projects and **installer** projects.
+
+There are also several other developing PODs, which are not listed here.
+
 
 Lab Resources
 -------------
 
-+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
-| POD Name   | Project(s)   | Project Lead(s)   | Email(s)                 |  POD Role      |  Status    | Notes     |
-+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
-| POD1       |  FUEL        | Gregory Elkinbard | gelkinbard@mirantis.com  |  CI: latest    |  Active    |           |
-+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+| POD Name | Project(s) | PTL(s)    | Email(s)                | POD Role   | Status | Notes     |
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+| POD1     | FUEL       | Gregory   | gelkinbard@mirantis.com | CI: latest | Active | Yardstick |
+|          |            | Elkinbard |                         |            |        | Funtest   |
+|          |            |           |                         |            |        | Doctor    |
+|          |            |           |                         |            |        | Parser    |
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+| POD2     | FUEL       | Gregory   | gelkinbard@mirantis.com | CI: latest | Active | Qtip      |
+|          |            | Elkinbard |                         |            |        |           |
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+
+* `POD1/POD2 wiki <https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab>`_
+* `POD1 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod1/>`_
+* `POD2 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod2/>`_
 
 
 Acceptable Usage Policy
 -----------------------
 
-Resources located in OPNFV ZTE NJ Lab shall only be used for CI, infra setup/configuration and troubleshooting purposes.
-No development work is allowed in OPNFV ZTE Lab.
+Resources located in OPNFV ZTE NJ Lab shall only be used for CI, infra setup/configuration and
+troubleshooting purposes. No development work is allowed in these PODs.
 
 
 Remote Access Infrastructure
@@ -42,10 +57,12 @@ Remote Access Procedure
 
 Access to this environment can be granted by sending an e-mail to:"wu.zhihui1@zte.com.cn"
 
-Subject: opnfv_zte_access.
+Subject: opnfv zte-pod[1-2] access.
 
 The following information should be provided in the request:
 
+::
+
     Full name:
     E-mail:
     Organization:
@@ -54,14 +71,16 @@ The following information should be provided in the request:
     What sepcific Host will be accessed:
     What support is needed from zte admin:
 
-Once access requirment is approved, the instructions for setting up VPN access will be send to you by mail.
+Once access requirment is approved, the instructions for setting up VPN access will be send to you
+by mail.
+
+
 Lab Documentation
 -----------------
 
-../zte.rst
-
 
 Lab Topology
 ------------
 
-.. image:: ../images/ZTE_Overview.jpg
+.. image:: ./images/zte_nj_lab_topoloy.png
+   :alt: POD diagram not found