Add zte-pod2 info in documents 35/17735/9
author10013968 <zhang.jun3g@zte.com.cn>
Wed, 27 Jul 2016 15:37:55 +0000 (23:37 +0800)
committerJulien <zhang.jun3g@zte.com.cn>
Tue, 9 Aug 2016 05:41:54 +0000 (13:41 +0800)
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>
docs/index.rst
docs/labs/ZTE.rst [deleted file]
docs/labs/images/ZTE_Overview.jpg [deleted file]
docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png [moved from docs/labs/zte-nj-lab/zte_nj_lab.png with 100% similarity]
docs/labs/zte-nj-lab/lab_description.rst
docs/labs/zte-nj-lab/pod1_description.rst [new file with mode: 0644]
docs/labs/zte-nj-lab/pod1_inventory.yaml [moved from docs/labs/zte-nj-lab/inventory.yaml with 88% similarity]
docs/labs/zte-nj-lab/pod2_description.rst [new file with mode: 0644]
docs/labs/zte-nj-lab/pod2_inventory.yaml [new file with mode: 0644]
docs/labs/zte-nj-lab/pod_description.rst [deleted file]
docs/labs/zte-nj-lab/zte-nj.rst [new file with mode: 0644]

index 9a8530a..cbdda3a 100755 (executable)
@@ -26,6 +26,7 @@ OPNFV Community Lab Infrastructure
    ./labs/OOL.rst
    ./labs/orange-paris-lab/orange_paris.rst
    ./labs/spirent.rst
+   ./labs/zte-nj-lab/zte-nj.rst
    ./labs/zte-sh-lab/zte-sh.rst
 
 Indices
diff --git a/docs/labs/ZTE.rst b/docs/labs/ZTE.rst
deleted file mode 100644 (file)
index e234821..0000000
+++ /dev/null
@@ -1,238 +0,0 @@
-ZTE OPNFV Testlab
-==================================================
-
-Overview
-------------------
-
-ZTE is hosting an OPNFV testlab at Nanjing facility. The testlab would host baremetal servers for
-the use of OPNFV community as part of the OPNFV Pharos Project.
-
-The ZTE Testlab consists of 1 POD
-    * POD for Fuel
-
-.. image:: images/ZTE_Overview.jpg
-   :alt: ZTE OPNFV Testlab Overview
-
-The POD consists of 8 servers that consist of
-    * 3 Servers for Control Nodes
-    * 3 Servers for Compute Nodes
-    * 2 Servers for spare
-
-
-Hardware details
------------------
-
-
-**POD-Fuel**
-
-The specifications for the servers within POD can be found below:
-
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Hostname         |  Model     |    Memory | Storage   | Processor           | Socket |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Fuel Jump Server | ZTE R4300  | 32 GB     | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node4            | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node5            | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node6            | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node10           | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node11           | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node12           | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node13           | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-| Node14           | ZTE E9000  | 128 GB    | 600GB HDD | Intel  Xeon E5-2680 |   2    |
-+------------------+------------+-----------+-----------+---------------------+--------+
-
-The specifications for the Network Interfaces of servers within POD can be seen below:
-
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Hostname  |  NIC Model            | Ports    | MAC               | BW  | Roles      |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Fuel Jump |  1, RTL8111/8168/8411 | enp8s0   | 98:f5:37:e1:b4:1b | 10G | mgmt       |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | enp9s0   | 98:f5:37:e1:b4:1c | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Inel 82599        | enp3s0f0 | 90:e2:ba:8b:08:64 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | enp3s0f1 | 90:e2:ba:8b:08:65 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node10    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:18 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:19 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:1a | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:1b | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:d8 | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:d9 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node11    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:3c | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:3d | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:3e | 10G | Storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:3f | 10G | Storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:5a:d4 | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:5a:d5 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node12    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:08 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:09 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:0a | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:0b | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:bd | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:be | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node4     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:1c | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:1d | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:1e | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:1f | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:a2 | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:a3 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node5     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:24 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:25 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:26 | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:27 | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:ab | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:ac | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node6     |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:40 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:41 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:42 | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:43 | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:fc | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:fd | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node13    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:38 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:39 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:3a | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:3b | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:87 | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:88 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-| Node14    |  1, Intel  82599      | eth0     | 4c:09:b4:b1:de:48 | 10G | Public     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth1     | 4c:09:b4:b1:de:49 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  2, Intel  82599      | eth2     | 4c:09:b4:b1:de:4a | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth3     | 4c:09:b4:b1:de:4b | 10G | storage    |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |  3, Intel  I350       | eth4     | 4c:09:b4:b2:59:75 | 10G | Admin/mgmt |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-|           |                       | eth5     | 4c:09:b4:b2:59:76 | 10G | Unused     |
-+-----------+-----------------------+----------+-------------------+-----+------------+
-
-
-Software
----------
-
-The Jump servers in the Testlab are pre-provisioned with the following software:
-
-   * Fuel-Jump Server:
-        1. OS: CentOS
-        2. Preprovisoned softwares: KVM, VNC server
-
-
-
-Networks
-----------
-
-**Subnet allocations**
-
-+----------------+--------------+----------------+-------------+----------+
-| Network name   | Address      | Mask           | Gateway     | VLAN id  |
-+----------------+--------------+----------------+-------------+----------+
-| Public         | 172.10.0.0   |  255.255.255.0 | 172.10.0.1  | Untagged |
-+----------------+--------------+----------------+-------------+----------+
-| Fuel Admin     | 192.168.0.0  |  255.255.255.0 | 192.168.0.1 | Untagged |
-+----------------+--------------+----------------+-------------+----------+
-| Fuel Mangement | 192.168.11.0 |  255.255.255.0 |             | 101      |
-+----------------+--------------+----------------+-------------+----------+
-| Fuel Storage   | 192.168.12.0 |  255.255.255.0 |             | 102      |
-+----------------+--------------+----------------+-------------+----------+
-
-
-**Lights out Network**
-
-**POD**
-
-All nodes can log in by jumpserver.
-
-+-----------+-------------------------+-------------------+----------+----------+
-| Hostname  | Lights-out address      | MAC               | Username | Password |
-+-----------+-------------------------+-------------------+----------+----------+
-| Fuel-Jump | 58.213.14.182:5902(ssh) | 90:e2:ba:8b:08:65 |  opnfv   |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node4     | 192.168.0.7             | 06:9d:69:13:5f:45 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node5     | 192.168.0.8             | 32:9b:c4:da:10:4c |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node6     | 192.168.0.6             | 46:18:c4:74:cf:40 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node10    | 192.168.0.4             | be:d0:49:d4:06:42 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node11    | 192.168.0.3             | a2:d5:c1:bb:2b:49 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node12    | 192.168.0.2             | 62:08:00:cd:4c:43 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node13    | 192.168.0.9             | 4c:09:b4:b2:59:87 |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-| Node14    | 192.168.0.10            | 9a:90:8a:db:e1:4c |          |          |
-+-----------+-------------------------+-------------------+----------+----------+
-
-
-Remote access infrastructure
------------------------------
-
-The ZTE OPNFV testlab is free to use for the OPNFV community.
-
-A VPN is used to provide access to the ZTE Testlab. Details can be found in *ZTE OPNFV-lab Access*
-document (Attach link)
-
-To access the Testlab, please contact Zhihui Wu(wu.zhihui1@zte.com.cn) with the following details:
- * Name
- * Organization
- * Purpose of using the lab
-
- Processing the request can take 2-3 business days.
-
- **Accessing the Jump Server**
-
- The credentials for accessing the Jump Server, please contact Zhihui Wu(wu.zhihui1@zte.com.cn).
diff --git a/docs/labs/images/ZTE_Overview.jpg b/docs/labs/images/ZTE_Overview.jpg
deleted file mode 100644 (file)
index 26eee13..0000000
Binary files a/docs/labs/images/ZTE_Overview.jpg and /dev/null differ
index b63148c..0bb7493 100644 (file)
@@ -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
diff --git a/docs/labs/zte-nj-lab/pod1_description.rst b/docs/labs/zte-nj-lab/pod1_description.rst
new file mode 100644 (file)
index 0000000..05acb56
--- /dev/null
@@ -0,0 +1,127 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. _pharos_pod:
+
+**********************
+ZTE POD1 Specification
+**********************
+
+
+Introduction
+------------
+
+POD1(means ZTE-POD1) uses Fuel as the installer and performs os-odl_l2-nofeature-ha CI latest
+verification. Currently, test projects such as Yardstick, Functest are performing daily CI tasks.
+Fueature projects such as Doctor, Parser will perform daily and verify CI tasks.
+
+
+Additional Requirements
+-----------------------
+
+
+Server Specifications
+---------------------
+
+
+**Jump Host**
+
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+|          |        |       |               |           | Memory | Local     | 1GbE: NIC#/IP     | 10GbE: NIC#/IP   |       |
+| Hostname | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage   | MAC/VLAN/Network  | MAC/VLAN/Network | Notes |
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+| Frog     | ZTE    | R4300 | 277662500093  | E5-2620x2 | 32     | 600GB HDD | IF0: 10.20.0.1    |                  |       |
+|          |        |       |               |           |        |           | 98:F5:37:E1:B4:1C |                  |       |
+|          |        |       |               |           |        |           | vlan 1            |                  |       |
+|          |        |       |               |           |        |           | PXE               |                  |       |
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+
+
+**Nodes/Servers**
+
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+|          |        |       |               |           | Memory | Local     | Lights-out network  | 1GbE: NIC#/IP       | 10GbE: NIC#/IP    |       |
+| Hostname | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network    | MAC/VLAN/Network  | Notes |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node1    | ZTE    | E9000 | 281498500141  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.101         | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 4c:09:b4:b2:59:84   | 4c:09:b4:b2:59:87   | 4c:09:b4:b1:de:38 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 1/PXE          | vlan 1/ public    |       |
+|          |        |       |               |           |        |           |                     | vlan 101/management | vlan 103/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 4c:09:b4:b1:de:3a |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 102/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node2    | ZTE    | E9000 | 281498500179  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.22          | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 4c:09:b4:b2:59:f9   | 4c:09:b4:b2:59:fc   | 4c:09:b4:b1:de:40 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 1/PXE          | vlan 1/ public    |       |
+|          |        |       |               |           |        |           |                     | vlan 101/management | vlan 103/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 4c:09:b4:b1:de:42 |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 102/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node3    | ZTE    | E9000 | 281498500008  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.3           | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 4c:09:b4:b2:59:9f   | 4c:09:b4:b2:59:a2   | 4c:09:b4:b1:de:1c |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 1/PXE          | vlan 1/ public    |       |
+|          |        |       |               |           |        |           |                     | vlan 101/management | vlan 103/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 4c:09:b4:b1:de:1e |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 102/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node4    | ZTE    | E9000 | 281498500157  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.4           | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 4c:09:b4:b2:59:d5   | 4c:09:b4:b2:59:d8   | 4c:09:b4:b1:de:18 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 1/PXE          | vlan 1/ public    |       |
+|          |        |       |               |           |        |           |                     | vlan 101/management | vlan 103/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 4c:09:b4:b1:de:1a |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 102/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node5    | ZTE    | E9000 | 281498500119  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.5           | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 4c:09:b4:b2:59:72   | 4c:09:b4:b2:59:75   | 4c:09:b4:b1:de:48 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 1/PXE          | vlan 1/ public    |       |
+|          |        |       |               |           |        |           |                     | vlan 101/management | vlan 103/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 4c:09:b4:b1:de:4a |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 102/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+
+**Subnet allocations**
+
++----------------+--------------+----------------+------------+---------------+
+| Network name   | Address      | Mask           | Gateway    | VLAN id       |
++----------------+--------------+----------------+------------+---------------+
+| Public         | 172.10.0.0   |  255.255.255.0 | 172.10.0.1 | untagged      |
++----------------+--------------+----------------+------------+---------------+
+| Fuel Admin/PXE | 10.20.0.0    |  255.255.255.0 | 10.20.0.2  | native vlan 1 |
++----------------+--------------+----------------+------------+---------------+
+| Fuel Mangement | 192.168.10.0 |  255.255.255.0 |            | 101           |
++----------------+--------------+----------------+------------+---------------+
+| Fuel Storage   | 192.168.11.0 |  255.255.255.0 |            | 102           |
++----------------+--------------+----------------+------------+---------------+
+
+
+VPN Users
+---------
+
++--------------+--------------+--------------+--------------+--------------+
+| Name         | Email        | Project      | Role         | Notes        |
++--------------+--------------+--------------+--------------+--------------+
+|              |              |              |              |              |
++--------------+--------------+--------------+--------------+--------------+
+
+
+Firewall Rules
+--------------
+
++---------------+---------+------+
+| Port(s)       | Service | Note |
++---------------+---------+------+
+| 1194(OpenVPN) | Jenkins |      |
++---------------+---------+------+
+
+
+POD Topology
+------------
+
+.. image:: ./images/zte_nj_pod1_topology.png
+   :alt: POD diagram not found
similarity index 88%
rename from docs/labs/zte-nj-lab/inventory.yaml
rename to docs/labs/zte-nj-lab/pod1_inventory.yaml
index b71f563..5ceb0db 100644 (file)
@@ -1,5 +1,5 @@
 nodes:
-   - name: node1-control
+   - name: node1
      tags: control      #optional param, other valid value "compute"
      arch: "x86_64"
      mac_address: "4c:09:b4:b2:59:87" #pxe boot interface mac
@@ -8,7 +8,7 @@ nodes:
        address: 129.5.1.101
        user: zteroot
        pass: superuser
-   - name: node2-control
+   - name: node2
      tags: control
      arch: "x86_64"
      mac_address: "4c:09:b4:b2:59:fc"
@@ -17,7 +17,7 @@ nodes:
        address: 129.5.1.22
        user: zteroot
        pass: superuser
-   - name: node3-control
+   - name: node3
      tags: control
      arch: "x86_64"
      mac_address: "4c:09:b4:b2:59:a2"
@@ -27,7 +27,7 @@ nodes:
        user: zteroot
        pass: superuser
 
-   - name: node4-control
+   - name: node4
      tags: compute
      arch: "x86_64"
      mac_address: "4c:09:b4:b2:59:d8"
@@ -37,7 +37,7 @@ nodes:
        user: zteroot
        pass: superuser
 
-   - name: node5-control
+   - name: node5
      tags: compute
      arch: "x86_64"
      mac_address: "4c:09:b4:b2:59:75"
diff --git a/docs/labs/zte-nj-lab/pod2_description.rst b/docs/labs/zte-nj-lab/pod2_description.rst
new file mode 100644 (file)
index 0000000..a03ecd1
--- /dev/null
@@ -0,0 +1,130 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. _pharos_pod:
+
+**********************
+ZTE POD2 Specification
+**********************
+
+
+Introduction
+------------
+
+POD2(means ZTE-POD2) uses Fuel as the installer and performs os-odl_l2-nofeature-ha CI latest
+verification. Qtip daily CI task will be migrated from POD1 to POD2. Qtip is also working on
+integration with Yardstick umbrella project.
+
+
+Additional Requirements
+-----------------------
+
+
+Server Specifications
+---------------------
+
+
+**Jump Host**
+
+POD2 share the same **Jump Host** with POD1:
+
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+|          |        |       |               |           | Memory | Local     | 1GbE: NIC#/IP     | 10GbE: NIC#/IP   |       |
+| Hostname | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage   | MAC/VLAN/Network  | MAC/VLAN/Network | Notes |
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+| Frog     | ZTE    | R4300 | 277662500093  | E5-2620x2 | 32     | 600GB HDD | IF0: 10.20.0.1    |                  |       |
+|          |        |       |               |           |        |           | 98:F5:37:E1:B4:1C |                  |       |
+|          |        |       |               |           |        |           | VLAN 1            |                  |       |
+|          |        |       |               |           |        |           | PXE               |                  |       |
++----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+
+
+
+**Compute Nodes**
+
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+|          |        |       |               |           | Memory | Local     | Lights-out network  | 1GbE: NIC#/IP       | 10GbE: NIC#/IP    |       |
+| Hostname | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage   | (IPMI): IP/MAC, U/P | MAC/VLAN/Network    | MAC/VLAN/Network  | Notes |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node1    | ZTE    | E9000 | 281498500141  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.9           | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 3c:da:2a:e8:01:ea   | 3c:da:2a:e8:01:ed   | 3c:da:2a:e9:02:dc |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 500/PXE        | vlan 500/ public  |       |
+|          |        |       |               |           |        |           |                     | vlan 501/management | vlan 503/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 3c:da:2a:e9:02:de |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 502/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node2    | ZTE    | E9000 | 281498500179  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.10          | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 3c:da:2a:e8:02:49   | 3c:da:2a:e8:02:4c   | 3c:da:2a:e9:02:d0 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 500/PXE        | vlan 500/ public  |       |
+|          |        |       |               |           |        |           |                     | vlan 501/management | vlan 503/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 3c:da:2a:e9:02:d2 |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 502/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node3    | ZTE    | E9000 | 281498500008  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.11          | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 3c:da:2a:e8:01:a4   | 3c:da:2a:e8:01:a7   | 3c:da:2a:e9:02:ec |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 500/PXE        | vlan 500/ public  |       |
+|          |        |       |               |           |        |           |                     | vlan 501/management | vlan 503/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 3c:da:2a:e9:02:ee |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 502/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node4    | ZTE    | E9000 | 281498500157  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.12          | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 3c:da:2a:e8:01:c7   | 3c:da:2a:e8:01:ca   | 3c:da:2a:e9:02:d4 |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 500/PXE        | vlan 500/ public  |       |
+|          |        |       |               |           |        |           |                     | vlan 501/management | vlan 503/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 3c:da:2a:e9:02:d6 |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 502/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+| node5    | ZTE    | E9000 | 281498500119  | E5-2680x2 | 128    | 600GB HDD | 129.5.1.13          | enp129s0f0:         | enp2s0f0:         |       |
+|          |        |       |               |           |        |           | 3c:da:2a:e8:01:b3   | 3c:da:2a:e8:01:b6   | 3c:da:2a:e9:02:ac |       |
+|          |        |       |               |           |        |           | zteroot/superuser   | vlan 500/PXE        | vlan 500/ public  |       |
+|          |        |       |               |           |        |           |                     | vlan 501/management | vlan 503/ private |       |
+|          |        |       |               |           |        |           |                     |                     | enp132s0f0:       |       |
+|          |        |       |               |           |        |           |                     |                     | 3c:da:2a:e9:02:ae |       |
+|          |        |       |               |           |        |           |                     |                     | vlan 502/ storage |       |
++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+
+**Subnet allocations**
+
++----------------+--------------+----------------+------------+-----------------+
+| Network name   | Address      | Mask           | Gateway    | VLAN id         |
++----------------+--------------+----------------+------------+-----------------+
+| Public         | 172.30.0.0   |  255.255.255.0 | 172.30.0.1 | Untagged        |
++----------------+--------------+----------------+------------+-----------------+
+| Fuel Admin     | 10.20.1.0    |  255.255.255.0 | 10.20.1.1  | native vlan 500 |
++----------------+--------------+----------------+------------+-----------------+
+| Fuel Mangement | 192.168.30.0 |  255.255.255.0 |            | 501             |
++----------------+--------------+----------------+------------+-----------------+
+| Fuel Storage   | 192.168.31.0 |  255.255.255.0 |            | 502             |
++----------------+--------------+----------------+------------+-----------------+
+
+
+VPN Users
+---------
+
++--------------+--------------+--------------+--------------+--------------+
+| Name         | Email        | Project      | Role         | Notes        |
++--------------+--------------+--------------+--------------+--------------+
+|              |              |              |              |              |
++--------------+--------------+--------------+--------------+--------------+
+
+
+Firewall Rules
+--------------
+
++---------------+---------+------+
+| Port(s)       | Service | Note |
++---------------+---------+------+
+| 1194(OpenVPN) | Jenkins |      |
++---------------+---------+------+
+
+
+POD Topology
+------------
+
+.. image:: ./zte_nj_pod2_topology.png
+   :alt: POD diagram not found
diff --git a/docs/labs/zte-nj-lab/pod2_inventory.yaml b/docs/labs/zte-nj-lab/pod2_inventory.yaml
new file mode 100644 (file)
index 0000000..c060a78
--- /dev/null
@@ -0,0 +1,49 @@
+nodes:
+   - name: node1
+     tags: control      #optional param, other valid value "compute"
+     arch: "x86_64"
+     mac_address: "3c:da:2a:e8:01:ed" #pxe boot interface mac
+     power:
+       type: ipmi
+       address: 129.5.1.9
+       user: zteroot
+       pass: superuser
+   - name: node2
+     tags: control
+     arch: "x86_64"
+     mac_address: "3c:da:2a:e8:02:4c"
+     power:
+       type: ipmi
+       address: 129.5.1.10
+       user: zteroot
+       pass: superuser
+   - name: node3
+     tags: control
+     arch: "x86_64"
+     mac_address: "3c:da:2a:e8:01:a7"
+     power:
+       type: ipmi
+       address: 129.5.1.11
+       user: zteroot
+       pass: superuser
+
+   - name: node4
+     tags: compute
+     arch: "x86_64"
+     mac_address: "3c:da:2a:e8:01:ca"
+     power:
+       type: ipmi
+       address: 129.5.1.12
+       user: zteroot
+       pass: superuser
+
+   - name: node5
+     tags: compute
+     arch: "x86_64"
+     mac_address: "3c:da:2a:e8:01:b6"
+     power:
+       type: ipmi
+       address: 129.5.1.13
+       user: zteroot
+       pass: superuser
+
diff --git a/docs/labs/zte-nj-lab/pod_description.rst b/docs/labs/zte-nj-lab/pod_description.rst
deleted file mode 100644 (file)
index b57d34e..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) 2016 OPNFV.
-
-.. _pharos_pod:
-
-**************************
-POD Specification Template
-**************************
-
-Introduction
-------------
-
-ZTE is hosting an OPNFV testlab at Nanjing facility. The testlab would host baremetal servers for the use of OPNFV community as part of the OPNFV Pharos Project.
-There is one pod used for CI latest and benchmark tests(Yardstick, Functest) based on Fuel.
-
-
-Additional Requirements
------------------------
-
-
-Server Specifications
----------------------
-
-**Jump Host**
-
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+--------------+
-| Jumpserver   |  ZTE         | ZTE R4300    | 277662500093 |  2 x E5-2620 |  32 GB       | 600GB HDD    | IF0: 10.20.0.1         |                        |              |
-|              |              |              |              |              |              |              | 98:F5:37:E1:B4:1C      |                        |              |
-|              |              |              |              |              |              |              | VLAN 1                 |                        |              |
-|              |              |              |              |              |              |              | PXE                    |                        |              |
-|              |              |              |              |              |              |              |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |              |
-|              |              |              |              |              |              |              |                        |                        |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+--------------+
-
-
-**Compute Nodes**
-
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-|              |              |              |              |              |              | Local        | Lights-out network     | 1GbE: NIC#/IP          | 10GbE: NIC#/IP         |              |
-|  Hostname    |  Vendor      | Model        | Serial Number|  CPUs        | Memory       | storage      | (IPMI): IP/MAC, U/P    | MAC/VLAN/Network       | MAC/VLAN/Network       | Notes        |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-jp-node1|  ZTE         |  ZTE E9000   | 281498500141 |  E5-2680 * 2 |  128GB       |  600GB HDD   |  129.5.1.101           |  enp129s0f0:           |  enp2s0f0:             |              |
-|              |              |              |              |              |              |              |  4c:09:b4:b2:59:87     |  4c:09:b4:b2:59:87     |  4c:09:b4:b1:de:38     |              |
-|              |              |              |              |              |              |              |  zteroot/superuser     |  vlan 1/PXE            |  vlan 1/ public        |              |
-|              |              |              |              |              |              |              |                        |  vlan 101/admin        |  vlan 103/ private     |              |
-|              |              |              |              |              |              |              |                        |                        |  enp132s0f0:           |              |
-|              |              |              |              |              |              |              |                        |                        |  4c:09:b4:b1:de:3a     |              |
-|              |              |              |              |              |              |              |                        |                        |  vlan 102/ storage     |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-jp-node2|  ZTE         |  ZTE E9000   | 281498500179 |  E5-2680 * 2 |  128GB       |  600GB HDD   |  129.5.1.22            |  enp129s0f0:           |  enp2s0f0:             |              |
-|              |              |              |              |              |              |              |  4c:09:b4:b2:59:fc     |  4c:09:b4:b2:59:fc     |  4c:09:b4:b1:de:40     |              |
-|              |              |              |              |              |              |              |  zteroot/superuser     |  vlan 1/PXE            |  vlan 1/ public        |              |
-|              |              |              |              |              |              |              |                        |  vlan 101/admin        |  vlan 103/ private     |              |
-|              |              |              |              |              |              |              |                        |                        |  enp132s0f0:           |              |
-|              |              |              |              |              |              |              |                        |                        |  4c:09:b4:b1:de:42     |              |
-|              |              |              |              |              |              |              |                        |                        |  vlan 102/ storage     |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-jp-node3|  ZTE         |  ZTE E9000   | 281498500008 |  E5-2680 * 2 |  128GB       |  600GB HDD   |  129.5.1.3             |  enp129s0f0:           |  enp2s0f0:             |              |
-|              |              |              |              |              |              |              |  4c:09:b4:b2:59:a2     |  4c:09:b4:b2:59:a2     |  4c:09:b4:b1:de:1c     |              |
-|              |              |              |              |              |              |              |  zteroot/superuser     |  vlan 1/PXE            |  vlan 1/ public        |              |
-|              |              |              |              |              |              |              |                        |  vlan 101/admin        |  vlan 103/ private     |              |
-|              |              |              |              |              |              |              |                        |                        |  enp132s0f0:           |              |
-|              |              |              |              |              |              |              |                        |                        |  4c:09:b4:b1:de:1e     |              |
-|              |              |              |              |              |              |              |                        |                        |  vlan 102/ storage     |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-jp-node4|  ZTE         |  ZTE E9000   | 281498500157 |  E5-2680 * 2 |  128GB       |  600GB HDD   |  129.5.1.4             |  enp129s0f0:           |  enp2s0f0:             |              |
-|              |              |              |              |              |              |              |  4c:09:b4:b2:59:d8     |  4c:09:b4:b2:59:d8     |  4c:09:b4:b1:de:18     |              |
-|              |              |              |              |              |              |              |  zteroot/superuser     |  vlan 1/PXE            |  vlan 1/ public        |              |
-|              |              |              |              |              |              |              |                        |  vlan 101/admin        |  vlan 103/ private     |              |
-|              |              |              |              |              |              |              |                        |                        |  enp132s0f0:           |              |
-|              |              |              |              |              |              |              |                        |                        |  4c:09:b4:b1:de:1a     |              |
-|              |              |              |              |              |              |              |                        |                        |  vlan 102/ storage     |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-| pod1-jp-node5|  ZTE         |  ZTE E9000   | 281498500119 |  E5-2680 * 2 |  128GB       |  600GB HDD   |  129.5.1.5             |  enp129s0f0:           |  enp2s0f0:             |              |
-|              |              |              |              |              |              |              |  4c:09:b4:b2:59:75     |  4c:09:b4:b2:59:75     |  4c:09:b4:b1:de:48     |              |
-|              |              |              |              |              |              |              |  zteroot/superuser     |  vlan 1/PXE            |  vlan 1/ public        |              |
-|              |              |              |              |              |              |              |                        |  vlan 101/admin        |  vlan 103/ private     |              |
-|              |              |              |              |              |              |              |                        |                        |  enp132s0f0:           |              |
-|              |              |              |              |              |              |              |                        |                        |  4c:09:b4:b1:de:4a     |              |
-|              |              |              |              |              |              |              |                        |                        |  vlan 102/ storage     |              |
-+--------------+--------------+--------------+--------------+--------------+--------------+--------------+------------------------+------------------------+------------------------+--------------+
-
-
-VPN Users
----------
-
-+--------------+--------------+--------------+--------------+--------------+
-| Name         | Email        | Project      | Role         | Notes        |
-+--------------+--------------+--------------+--------------+--------------+
-|              |              |              |              |              |
-+--------------+--------------+--------------+--------------+--------------+
-
-
-Firewall Rules
---------------
-
-+--------------+--------------+--------------+
-| Port(s)      | Service      | Note         |
-+--------------+--------------+--------------+
-| 1194         | OpenVPN      |              |
-+--------------+--------------+--------------+
-
-
-POD Topology
-------------
-
-.. image:: ./zte_nj_lab.png
-   :alt: POD diagram not found
diff --git a/docs/labs/zte-nj-lab/zte-nj.rst b/docs/labs/zte-nj-lab/zte-nj.rst
new file mode 100644 (file)
index 0000000..94fb322
--- /dev/null
@@ -0,0 +1,16 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. Top level of Pharos templates and configuration files
+
+*****************************************
+ZTE NJ Pharos Lab and Configuration Files
+*****************************************
+
+
+.. toctree::
+
+   ./lab_description.rst
+   ./pod1_description.rst
+   ./pod2_description.rst