Migration ZTE NJ LAB from Nanjing to Shanghai

1. Migration ZTE POD1 and POD2 in Nanjing testlab into Shanghai. Update
releated documents.
2. Update lab topology.
3. Separate Deploy Server from Jump Host.

JIRA: PHAROS-245
JIRA: PHAROS-246

Change-Id: Ib567b564dec92c2bba780d4bd7af89c13fe5315e
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>

9 files changed, 445 insertions, 23 deletions

diff --git a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png b/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png
index 5c2576df..6c147dbc 100644
--- a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png
+++ b/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png
diff --git a/docs/labs/zte-sh-lab/images/zte_sh_pod3_topology.png b/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png
index 592b6077..592b6077 100644
--- a/docs/labs/zte-sh-lab/images/zte_sh_pod3_topology.png
+++ b/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png
diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst
index e48c21d4..f8ee36ed 100644
--- a/docs/labs/zte-sh-lab/index.rst
+++ b/docs/labs/zte-sh-lab/index.rst
@@ -10,6 +10,9 @@ ZTE SH Pharos Lab Configuration Files
 
 
 .. toctree::
+   :maxdepth: 2
 
    ./lab_description.rst
+   ./pod1_description.rst
+   ./pod2_description.rst
    ./pod3_description.rst
diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst
index bb125f1e..f6224855 100644
--- a/docs/labs/zte-sh-lab/lab_description.rst
+++ b/docs/labs/zte-sh-lab/lab_description.rst
@@ -12,9 +12,10 @@ ZTE SH Lab Specification
 Introduction
 ------------
 
-ZTE SH Pharos lab currently has one POD available in Shanghai. The POD has 5 servers, 3 controller
-nodes and 2 computer nodes. It is dedicatedly used for baremetal CI. The POD is supposed to support
-scenarios related with performance enhancement projects, such as KVM, OVS, FDS, etc.
+ZTE SH Pharos lab currently has three PODs available in Shanghai. Each POD has 5 servers, 3
+controller nodes and 2 computer nodes. These PODs are dedicatedly used for Production/CI. These PODs
+focus scenarios related with **test** projects, **installer** projects and performance enhancement
+projects, such as KVM, OVS, FDS, etc.
 
 Scenarios planned are list here:
 
@@ -28,14 +29,24 @@ Scenarios are defined in
 Lab Resources
 -------------
 
-+----------+------------+-----------+-------------------------+------------+--------+---------+
-| POD Name | Project(s) | PTL(s)    | Email(s)                | POD Role   | Status | Notes   |
-+----------+------------+-----------+-------------------------+------------+--------+---------+
-| POD3     | FUEL       | Gregory   | gelkinbard@mirantis.com | CI: latest | Active | NFV-KVM |
-|          |            | Elkinbard |                         |            |        | OVSNFV  |
-+----------+------------+-----------+-------------------------+------------+--------+---------+
-
-- `POD3 wiki page <https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab>`_
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+| 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 |                         |            |        |           |
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+| POD3     | FUEL       | Gregory   | gelkinbard@mirantis.com | CI: latest | Active | NFV-KVM   |
+|          |            | Elkinbard |                         |            |        | OVSNFV    |
++----------+------------+-----------+-------------------------+------------+--------+-----------+
+
+- `POD1-3 wiki page <https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab>`_
+* `POD1 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod1/>`_
+* `POD2 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod2/>`_
 - `POD3 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod3/>`_
 
 
@@ -43,7 +54,7 @@ Acceptable Usage Policy
 -----------------------
 
 Resources located in OPNFV ZTE SH lab shall only be used for CI, infra setup/configuration and
-troubleshooting purposes. No development work is allowed in this Lab.
+troubleshooting purposes. No development work is allowed in these PODs.
 
 
 Remote Access Infrastructure
@@ -57,7 +68,7 @@ Remote Access Procedure
 
 Access to this environment can be granted by sending an e-mail to: **yangyang1@zte.com.cn**.
 
-Subject: opnfv zte-pod3 access.
+Subject: opnfv zte-pod[1-3] access.
 
 The following information should be provided in the request:
 
@@ -83,3 +94,34 @@ Lab Topology
 
 .. image:: ./images/zte_sh_lab_topology.png
    :alt: Lab diagram not found
+
+All the PODs share the same **Jump Host** for only one public IP address is allocated for the
+pharos lab. Deploy servers are separated from Jump Host. Every 2 PODs share one **Deploy Server**.
+
+**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 |
++----------+--------+-------+---------------+---------+--------+-----------+--------------------+------------------+-------+
+| Rabbit   | HP     | 5500  | -             | X5647x2 | 24     | 250GB SAS | IF0:               |                  |       |
+|          |        |       |               |         |        | 2 TB HDD  | a0:36:9f:00:11:34/ |                  |       |
+|          |        |       |               |         |        |           | 192.168.1.1/       |                  |       |
+|          |        |       |               |         |        |           | native vlan/OA     |                  |       |
+|          |        |       |               |         |        |           | IF1:               |                  |       |
+|          |        |       |               |         |        |           | a0:36:9f:00:11:35/ |                  |       |
+|          |        |       |               |         |        |           | 172.10.0.1/        |                  |       |
+|          |        |       |               |         |        |           | vlan 103/Public    |                  |       |
+|          |        |       |               |         |        |           | 172.20.0.1/        |                  |       |
+|          |        |       |               |         |        |           | vlan 113/Public    |                  |       |
+|          |        |       |               |         |        |           | 172.60.0.1/        |                  |       |
+|          |        |       |               |         |        |           | vlan 163/Public    |                  |       |
+|          |        |       |               |         |        |           | 172.70.0.1/        |                  |       |
+|          |        |       |               |         |        |           | vlan 173/Public    |                  |       |
+|          |        |       |               |         |        |           | IF2:               |                  |       |
+|          |        |       |               |         |        |           | a0.36:9:00:11:37/  |                  |       |
+|          |        |       |               |         |        |           | 116.228.53.183/    |                  |       |
+|          |        |       |               |         |        |           | native vlan/       |                  |       |
+|          |        |       |               |         |        |           | Internet           |                  |       |
++----------+--------+-------+---------------+---------+--------+-----------+--------------------+------------------+-------+
+
diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod1_description.rst
new file mode 100644
index 00000000..27666308
--- /dev/null
+++ b/docs/labs/zte-sh-lab/pod1_description.rst
@@ -0,0 +1,135 @@
+.. 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**
+
+POD1 share the same **Jump Host** in the lab.
+
+**Deploy server**
+
++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+
+|           |        |       |               |           | Memory | Local     | 1GbE: NIC#/IP      | 10GbE: NIC#/IP   |       |
+| Hostname  | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage   | MAC/VLAN/Network   | MAC/VLAN/Network | Notes |
++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+
+| Jellyfish | ZTE    | R5300 | 277662500093  | E5-2620x2 | 128    | 600GB SAS | IF0:               |                  |       |
+|           |        |       |               |           |        | 4 TB HDD  | 74:4a:a4:00:91:b3/ |                  |       |
+|           |        |       |               |           |        |           | 10.20.6.1/         |                  |       |
+|           |        |       |               |           |        |           | native vlan/PXE    |                  |       |
+|           |        |       |               |           |        |           | IF1:               |                  |       |
+|           |        |       |               |           |        |           | 74:4a:a4:00:91:b4/ |                  |       |
+|           |        |       |               |           |        |           | 10.20.7.1/         |                  |       |
+|           |        |       |               |           |        |           | native vlan/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_sh_pod_topology.png
+   :alt: POD diagram not found
diff --git a/docs/labs/zte-sh-lab/pod1_inventory.yaml b/docs/labs/zte-sh-lab/pod1_inventory.yaml
new file mode 100644
index 00000000..5ceb0dbd
--- /dev/null
+++ b/docs/labs/zte-sh-lab/pod1_inventory.yaml
@@ -0,0 +1,49 @@
+nodes:
+   - 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
+     power:
+       type: ipmi
+       address: 129.5.1.101
+       user: zteroot
+       pass: superuser
+   - name: node2
+     tags: control
+     arch: "x86_64"
+     mac_address: "4c:09:b4:b2:59:fc"
+     power:
+       type: ipmi
+       address: 129.5.1.22
+       user: zteroot
+       pass: superuser
+   - name: node3
+     tags: control
+     arch: "x86_64"
+     mac_address: "4c:09:b4:b2:59:a2"
+     power:
+       type: ipmi
+       address: 129.5.1.3
+       user: zteroot
+       pass: superuser
+
+   - name: node4
+     tags: compute
+     arch: "x86_64"
+     mac_address: "4c:09:b4:b2:59:d8"
+     power:
+       type: ipmi
+       address: 129.5.1.4
+       user: zteroot
+       pass: superuser
+
+   - name: node5
+     tags: compute
+     arch: "x86_64"
+     mac_address: "4c:09:b4:b2:59:75"
+     power:
+       type: ipmi
+       address: 129.5.1.5
+       user: zteroot
+       pass: superuser
+
diff --git a/docs/labs/zte-sh-lab/pod2_description.rst b/docs/labs/zte-sh-lab/pod2_description.rst
new file mode 100644
index 00000000..1931ba56
--- /dev/null
+++ b/docs/labs/zte-sh-lab/pod2_description.rst
@@ -0,0 +1,136 @@
+.. 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** in the lab.
+
+**Deploy Server**
+
+POD2 share the same **Deploy Server** 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 |
++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+
+| Jellyfish | ZTE    | R5300 | 277662500093  | E5-2620x2 | 128    | 600GB SAS | IF0:               |                  |       |
+|           |        |       |               |           |        | 4 TB HDD  | 74:4a:a4:00:91:b3/ |                  |       |
+|           |        |       |               |           |        |           | 10.20.6.1/         |                  |       |
+|           |        |       |               |           |        |           | native vlan/PXE    |                  |       |
+|           |        |       |               |           |        |           | IF1:               |                  |       |
+|           |        |       |               |           |        |           | 74:4a:a4:00:91:b4/ |                  |       |
+|           |        |       |               |           |        |           | 10.20.7.1/         |                  |       |
+|           |        |       |               |           |        |           | native vlan/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:: ./images/zte_sh_pod_topology.png
+   :alt: POD diagram not found
diff --git a/docs/labs/zte-sh-lab/pod2_inventory.yaml b/docs/labs/zte-sh-lab/pod2_inventory.yaml
new file mode 100644
index 00000000..c060a78f
--- /dev/null
+++ b/docs/labs/zte-sh-lab/pod2_inventory.yaml
@@ -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-sh-lab/pod3_description.rst b/docs/labs/zte-sh-lab/pod3_description.rst
index fdc32d16..f0cfae7b 100644
--- a/docs/labs/zte-sh-lab/pod3_description.rst
+++ b/docs/labs/zte-sh-lab/pod3_description.rst
@@ -25,15 +25,23 @@ 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    | R5300 | 210077307607  | E5-2609x2 | 32     | 600GB SAS | IF0: 10.20.0.1    |                  |       |
-|          |        |       |               |           |        | 2TB HDD   | 74:4a:a4:00:21:0b |                  |       |
-|          |        |       |               |           |        |           | vlan 100/PXE      |                  |       |
-|          |        |       |               |           |        |           |                   |                  |       |
-+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+
+POD3 share the same **Jump Host** in the lab.
+
+**Deploy Server**
+
++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+
+|          |        |       |               |           | Memory | Local      | 1GbE: NIC#/IP      | 10GbE: NIC#/IP   |       |
+| Hostname | Vendor | Model | Serial Number | CPUs      | (GB)   | Storage    | MAC/VLAN/Network   | MAC/VLAN/Network | Notes |
++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+
+| Spider   | ZTE    | R5300 | 210077307607  | E5-2609x1 | 32     | 600GB SAS  | IF0:               |                  |       |
+|          |        |       |               |           |        | 1.2TB SCSI | 74:4a:a4:00:21:0b/ |                  |       |
+|          |        |       |               |           |        |            | 10.20.0.1/         |                  |       |
+|          |        |       |               |           |        |            | native vlan/PXE    |                  |       |
+|          |        |       |               |           |        |            | IF1:               |                  |       |
+|          |        |       |               |           |        |            | 74:4a:a4:00:21:0c/ |                  |       |
+|          |        |       |               |           |        |            | 10.20.1.1/         |                  |       |
+|          |        |       |               |           |        |            | native vlan/PXE    |                  |       |
++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+
 
 
 **Compute Nodes**
@@ -151,5 +159,5 @@ Firewall Rules
 POD Topology
 ------------
 
-.. image:: ./images/zte_sh_pod3_topology.png
+.. image:: ./images/zte_sh_pod_topology.png
    :alt: POD diagram not found