From 0b2d696d723a047adb5f77e687ceeb609f1894e9 Mon Sep 17 00:00:00 2001 From: 10013968 Date: Wed, 27 Jul 2016 23:37:55 +0800 Subject: Add zte-pod2 info in documents Update the documents structure to describe 2 PODs in ZTE NJ Pharos Lab: Update the template; Update zte-pod1 informaton; Add zte-pod2 information; Add zte-nj.rst into index.rst JIRA: PHAROS-235 Change-Id: Ib06e2d0c247a260e4c64909b90d2b33b32bc9dc6 Signed-off-by: Julien-zte Signed-off-by: wu.zhihui --- .../labs/zte-nj-lab/images/zte_nj_lab_topology.png | Bin 0 -> 84145 bytes docs/labs/zte-nj-lab/inventory.yaml | 49 -------- docs/labs/zte-nj-lab/lab_description.rst | 51 +++++--- docs/labs/zte-nj-lab/pod1_description.rst | 127 ++++++++++++++++++++ docs/labs/zte-nj-lab/pod1_inventory.yaml | 49 ++++++++ docs/labs/zte-nj-lab/pod2_description.rst | 130 +++++++++++++++++++++ docs/labs/zte-nj-lab/pod2_inventory.yaml | 49 ++++++++ docs/labs/zte-nj-lab/pod_description.rst | 114 ------------------ docs/labs/zte-nj-lab/zte-nj.rst | 16 +++ docs/labs/zte-nj-lab/zte_nj_lab.png | Bin 84145 -> 0 bytes 10 files changed, 406 insertions(+), 179 deletions(-) create mode 100644 docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png delete mode 100644 docs/labs/zte-nj-lab/inventory.yaml create mode 100644 docs/labs/zte-nj-lab/pod1_description.rst create mode 100644 docs/labs/zte-nj-lab/pod1_inventory.yaml create mode 100644 docs/labs/zte-nj-lab/pod2_description.rst create mode 100644 docs/labs/zte-nj-lab/pod2_inventory.yaml delete mode 100644 docs/labs/zte-nj-lab/pod_description.rst create mode 100644 docs/labs/zte-nj-lab/zte-nj.rst delete mode 100644 docs/labs/zte-nj-lab/zte_nj_lab.png (limited to 'docs/labs/zte-nj-lab') diff --git a/docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png b/docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png new file mode 100644 index 00000000..5885fc6e Binary files /dev/null and b/docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png differ diff --git a/docs/labs/zte-nj-lab/inventory.yaml b/docs/labs/zte-nj-lab/inventory.yaml deleted file mode 100644 index b71f5632..00000000 --- a/docs/labs/zte-nj-lab/inventory.yaml +++ /dev/null @@ -1,49 +0,0 @@ -nodes: - - name: node1-control - 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-control - 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-control - 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-control - 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-control - 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-nj-lab/lab_description.rst b/docs/labs/zte-nj-lab/lab_description.rst index b63148ca..0bb74933 100644 --- a/docs/labs/zte-nj-lab/lab_description.rst +++ b/docs/labs/zte-nj-lab/lab_description.rst @@ -4,31 +4,46 @@ .. _pharos_lab: -************************** +************************ ZTE NJ Lab Specification -************************** +************************ + Introduction ------------ -ZTE lab currently has one POD available in Nanjing. The POD have 5 hosts, 3 controller+2 computer. -It focuses on fuel project CI-related activities. +ZTE NJ Pharos lab currently has two PODs available in Nanjing. Each POD has 5 servers, 3 controller +nodes and 2 computer nodes. They are dedicatedly used for CI. These PODs focus scenarios related +with **test** projects and **installer** projects. + +There are also several other developing PODs, which are not listed here. + Lab Resources ------------- -+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+ -| POD Name | Project(s) | Project Lead(s) | Email(s) | POD Role | Status | Notes | -+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+ -| POD1 | FUEL | Gregory Elkinbard | gelkinbard@mirantis.com | CI: latest | Active | | -+------------+--------------+-------------------+--------------------------+----------------+------------+-----------+ ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD Name | Project(s) | PTL(s) | Email(s) | POD Role | Status | Notes | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD1 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Yardstick | +| | | Elkinbard | | | | Funtest | +| | | | | | | Doctor | +| | | | | | | Parser | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD2 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Qtip | +| | | Elkinbard | | | | | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ + +* `POD1/POD2 wiki `_ +* `POD1 jenkins slave `_ +* `POD2 jenkins slave `_ 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 index 00000000..05acb567 --- /dev/null +++ b/docs/labs/zte-nj-lab/pod1_description.rst @@ -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 diff --git a/docs/labs/zte-nj-lab/pod1_inventory.yaml b/docs/labs/zte-nj-lab/pod1_inventory.yaml new file mode 100644 index 00000000..5ceb0dbd --- /dev/null +++ b/docs/labs/zte-nj-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-nj-lab/pod2_description.rst b/docs/labs/zte-nj-lab/pod2_description.rst new file mode 100644 index 00000000..a03ecd1a --- /dev/null +++ b/docs/labs/zte-nj-lab/pod2_description.rst @@ -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 index 00000000..c060a78f --- /dev/null +++ b/docs/labs/zte-nj-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-nj-lab/pod_description.rst b/docs/labs/zte-nj-lab/pod_description.rst deleted file mode 100644 index b57d34e1..00000000 --- a/docs/labs/zte-nj-lab/pod_description.rst +++ /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 index 00000000..94fb322f --- /dev/null +++ b/docs/labs/zte-nj-lab/zte-nj.rst @@ -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 diff --git a/docs/labs/zte-nj-lab/zte_nj_lab.png b/docs/labs/zte-nj-lab/zte_nj_lab.png deleted file mode 100644 index 5885fc6e..00000000 Binary files a/docs/labs/zte-nj-lab/zte_nj_lab.png and /dev/null differ -- cgit 1.2.3-korg