From e2b42ab54e738de91ee9f8e92576dbd9340198fc Mon Sep 17 00:00:00 2001 From: Julien Date: Mon, 19 Sep 2016 08:48:24 +0800 Subject: Update the file naming Update lab and pod name according to discussion of Pharos meeting on Sep.14, consistent naming for labs directory: https://wiki.opnfv.org/display/pharos/Pharos+git+repo Change-Id: I54520dda3f0662e42b8c1199f23036ced65b73bf Signed-off-by: Julien --- docs/labs/zte-sh-lab/index.rst | 6 +- docs/labs/zte-sh-lab/lab_description.rst | 4 +- docs/labs/zte-sh-lab/pod-1.rst | 160 +++++++++++++++++++++++++++++ docs/labs/zte-sh-lab/pod-1.yaml | 46 +++++++++ docs/labs/zte-sh-lab/pod-2.rst | 162 +++++++++++++++++++++++++++++ docs/labs/zte-sh-lab/pod-2.yaml | 46 +++++++++ docs/labs/zte-sh-lab/pod-3.rst | 163 ++++++++++++++++++++++++++++++ docs/labs/zte-sh-lab/pod-3.yaml | 47 +++++++++ docs/labs/zte-sh-lab/pod1_description.rst | 160 ----------------------------- docs/labs/zte-sh-lab/pod1_inventory.yaml | 46 --------- docs/labs/zte-sh-lab/pod2_description.rst | 162 ----------------------------- docs/labs/zte-sh-lab/pod2_inventory.yaml | 46 --------- docs/labs/zte-sh-lab/pod3_description.rst | 163 ------------------------------ docs/labs/zte-sh-lab/pod3_inventory.yaml | 47 --------- 14 files changed, 629 insertions(+), 629 deletions(-) create mode 100644 docs/labs/zte-sh-lab/pod-1.rst create mode 100644 docs/labs/zte-sh-lab/pod-1.yaml create mode 100644 docs/labs/zte-sh-lab/pod-2.rst create mode 100644 docs/labs/zte-sh-lab/pod-2.yaml create mode 100644 docs/labs/zte-sh-lab/pod-3.rst create mode 100644 docs/labs/zte-sh-lab/pod-3.yaml delete mode 100644 docs/labs/zte-sh-lab/pod1_description.rst delete mode 100644 docs/labs/zte-sh-lab/pod1_inventory.yaml delete mode 100644 docs/labs/zte-sh-lab/pod2_description.rst delete mode 100644 docs/labs/zte-sh-lab/pod2_inventory.yaml delete mode 100644 docs/labs/zte-sh-lab/pod3_description.rst delete mode 100644 docs/labs/zte-sh-lab/pod3_inventory.yaml (limited to 'docs') diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst index f8ee36ed..f767d8d5 100644 --- a/docs/labs/zte-sh-lab/index.rst +++ b/docs/labs/zte-sh-lab/index.rst @@ -13,6 +13,6 @@ ZTE SH Pharos Lab Configuration Files :maxdepth: 2 ./lab_description.rst - ./pod1_description.rst - ./pod2_description.rst - ./pod3_description.rst + ./pod-1.rst + ./pod-2.rst + ./pod-3.rst diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst index 47caed45..0d9d2dd0 100644 --- a/docs/labs/zte-sh-lab/lab_description.rst +++ b/docs/labs/zte-sh-lab/lab_description.rst @@ -95,8 +95,8 @@ 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**. +All the PODs share the same **Jump Host** for only one public IP address is allocated for ZTE +Pharos Lab. Deploy servers are separated from Jump Host. Each POD has itsown **Deploy Server**. **Jump Host** diff --git a/docs/labs/zte-sh-lab/pod-1.rst b/docs/labs/zte-sh-lab/pod-1.rst new file mode 100644 index 00000000..7ec53a82 --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-1.rst @@ -0,0 +1,160 @@ +.. 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 | 701763100025 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.101 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:cf:d9 | 74:4a:a4:00:cf:dc | 74:4a:a4:00:b0:e1 | | +| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:b0:e2 | | +| | | | | | | | | | vlan 162/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:b0:dd | | +| | | | | | | | | | vlan 1120/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:b0:de | | +| | | | | | | | | | vlan 163/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node2 | ZTE | E9000 | 701763100224 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.102 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:ce:cb | 74:4a:a4:00:ce:ce | 74:4a:a4:00:d6:ad | | +| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:ae | | +| | | | | | | | | | vlan 162/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d6:a9 | | +| | | | | | | | | | vlan 1120/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:aa | | +| | | | | | | | | | vlan 163/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node3 | ZTE | E9000 | 701763100064 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.103 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:cf:55 | 74:4a:a4:00:cf:58 | 74:4a:a4:00:d6:ab | | +| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:ac | | +| | | | | | | | | | vlan 162/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d6:af | | +| | | | | | | | | | vlan 1120/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:b0 | | +| | | | | | | | | | vlan 163/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node4 | ZTE | E9000 | 289842100103 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.104 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:49:81 | 74:4a:a4:00:49:84 | 74:4a:a4:00:b1:a5 | | +| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:b1:a6 | | +| | | | | | | | | | vlan 162/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:b1:b1 | | +| | | | | | | | | | vlan 1120/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:b1:b2 | | +| | | | | | | | | | vlan 163/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node5 | ZTE | E9000 | 701763100220 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.105 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:ce:bf | 74:4a:a4:00:ce:c2 | 74:4a:a4:00:d6:8d | | +| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:8e | | +| | | | | | | | | | vlan 162/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d6:9b | | +| | | | | | | | | | vlan 1120/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:9c | | +| | | | | | | | | | vlan 163/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ + +**Subnet allocations** + ++----------------+--------------+----------------+------------+-----------------+ +| Network name | Address | Mask | Gateway | VLAN id | ++----------------+--------------+----------------+------------+-----------------+ +| Public | 172.60.0.0 | 255.255.255.0 | 172.60.0.1 | 163 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Admin/PXE | 10.20.6.0 | 255.255.255.0 | 10.20.6.2 | native vlan 160 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Mangement | 192.168.61.0 | 255.255.255.0 | | 161 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Storage | 192.168.62.0 | 255.255.255.0 | | 162 | ++----------------+--------------+----------------+------------+-----------------+ + + +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/pod-1.yaml b/docs/labs/zte-sh-lab/pod-1.yaml new file mode 100644 index 00000000..3414bc12 --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-1.yaml @@ -0,0 +1,46 @@ +nodes: + - name: node1 + tags: control #optional param, other valid value "compute" + arch: "x86_64" + mac_address: "74:4A:A4:00:CF:DC" #pxe boot interface mac + power: + type: ipmi + address: 192.168.1.101 + user: zteroot + pass: superuser + - name: node2 + tags: control + arch: "x86_64" + mac_address: "74:4A:A4:00:CE:CE" + power: + type: ipmi + address: 192.168.1.102 + user: zteroot + pass: superuser + - name: node3 + tags: control + arch: "x86_64" + mac_address: "74:4A:A4:00:CF:58" + power: + type: ipmi + address: 192.168.1.103 + user: zteroot + pass: superuser + - name: node4 + tags: compute + arch: "x86_64" + mac_address: "74:4A:A4:00:49:84" + power: + type: ipmi + address: 192.168.1.104 + user: zteroot + pass: superuser + - name: node5 + tags: compute + arch: "x86_64" + mac_address: "74:4A:A4:00:CE:C2" + power: + type: ipmi + address: 192.168.1.105 + user: zteroot + pass: superuser diff --git a/docs/labs/zte-sh-lab/pod-2.rst b/docs/labs/zte-sh-lab/pod-2.rst new file mode 100644 index 00000000..961aa2a0 --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-2.rst @@ -0,0 +1,162 @@ +.. 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 | | | ++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+ + + +**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 | 701763100114 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.106 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:cd:6f | 74:4a:a4:00:cd:72 | 74:4a:a4:00:b0:e9 | | +| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:b0:ea | | +| | | | | | | | | | vlan 172/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:b0:eb | | +| | | | | | | | | | vlan 1130/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:b0:ec | | +| | | | | | | | | | vlan 173/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node2 | ZTE | E9000 | 701360500105 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.107 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:ca:c9 | 74:4a:a4:00:ca:cc | 74:4a:a4:00:d6:a3 | | +| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:a4 | | +| | | | | | | | | | vlan 172/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d6:99 | | +| | | | | | | | | | vlan 1130/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:9a | | +| | | | | | | | | | vlan 173/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node3 | ZTE | E9000 | 701360500026 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.108 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:cd:0f | 74:4a:a4:00:cd:12 | 74:4a:a4:00:d6:9d | | +| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:9e | | +| | | | | | | | | | vlan 172/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d3:15 | | +| | | | | | | | | | vlan 1130/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d3:16 | | +| | | | | | | | | | vlan 173/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node4 | ZTE | E9000 | 701763100099 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.109 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:cf:3d | 74:4a:a4:00:cf:40 | 74:4a:a4:00:d6:a5 | | +| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:a6 | | +| | | | | | | | | | vlan 172/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d6:a7 | | +| | | | | | | | | | vlan 1130/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d6:a8 | | +| | | | | | | | | | vlan 173/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ +| node5 | ZTE | E9000 | 701763100018 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.110 | ens4f0: | ens12f0: | | +| | | | | | | | 74:4a:a4:00:ce:d1 | 74:4a:a4:00:ce:d4 | 74:4a:a4:00:d2:c3 | | +| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | +| | | | | | | | | | ens12f1: | | +| | | | | | | | | | 74:4a:a4:00:d2:c4 | | +| | | | | | | | | | vlan 172/ storage | | +| | | | | | | | | | ens44f0: | | +| | | | | | | | | | 74:4a:a4:00:d2:c1 | | +| | | | | | | | | | vlan 1130/ private | | +| | | | | | | | | | ens44f1: | | +| | | | | | | | | | 74:4a:a4:00:d2:c2 | | +| | | | | | | | | | vlan 173/ public | | ++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ + + +**Subnet allocations** + ++----------------+--------------+----------------+------------+-----------------+ +| Network name | Address | Mask | Gateway | VLAN id | ++----------------+--------------+----------------+------------+-----------------+ +| Public | 172.70.0.0 | 255.255.255.0 | 172.70.0.1 | 173 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Admin | 10.20.7.0 | 255.255.255.0 | 10.20.7.1 | native vlan 170 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Mangement | 192.168.71.0 | 255.255.255.0 | | 171 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Storage | 192.168.72.0 | 255.255.255.0 | | 172 | ++----------------+--------------+----------------+------------+-----------------+ + + +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/pod-2.yaml b/docs/labs/zte-sh-lab/pod-2.yaml new file mode 100644 index 00000000..a49ac190 --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-2.yaml @@ -0,0 +1,46 @@ +nodes: + - name: node1 + tags: control #optional param, other valid value "compute" + arch: "x86_64" + mac_address: "74:4A:A4:00:CD:72" #pxe boot interface mac + power: + type: ipmi + address: 192.168.1.106 + user: zteroot + pass: superuser + - name: node2 + tags: control + arch: "x86_64" + mac_address: "74:4A:A4:00:CA:CC" + power: + type: ipmi + address: 192.168.1.107 + user: zteroot + pass: superuser + - name: node3 + tags: control + arch: "x86_64" + mac_address: "74:4A:A4:00:CD:12" + power: + type: ipmi + address: 192.168.1.108 + user: zteroot + pass: superuser + - name: node4 + tags: compute + arch: "x86_64" + mac_address: "74:4A:A4:00:CF:40" + power: + type: ipmi + address: 192.168.1.109 + user: zteroot + pass: superuser + - name: node5 + tags: compute + arch: "x86_64" + mac_address: "74:4A:A4:00:CE:D4" + power: + type: ipmi + address: 192.168.1.110 + user: zteroot + pass: superuser diff --git a/docs/labs/zte-sh-lab/pod-3.rst b/docs/labs/zte-sh-lab/pod-3.rst new file mode 100644 index 00000000..f0cfae7b --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-3.rst @@ -0,0 +1,163 @@ +.. 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 SH POD3 Specification +************************* + + +Introduction +------------ + +POD3(means ZTE-POD3) uses Fuel as the installer and performs os-nosdn-kvm-ha CI latest verification. +Feature projects like NFV-KVMV, OVSNFV will be run in this POD. + + +Additional Requirements +----------------------- + + +Server Specifications +--------------------- + +**Jump Host** + +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** + ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ +| | | | | | 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 | 289016500203 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.32 | | enp2s0f0: | | +| | | | | | | | 0c:12:62:e4:bf:de | | 74:4a:a4:00:0b:85 | | +| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | +| | | | | | | | | | enp2s0f1: | | +| | | | | | | | | | 74:4a:a4:00:0b:86 | | +| | | | | | | | | | vlan 101/ mgmt | | +| | | | | | | | | | enp132s0f0: | | +| | | | | | | | | | 74:4a:a4:00:0b:87 | | +| | | | | | | | | | vlan 102/ storage | | +| | | | | | | | | | enp132s0f1: | | +| | | | | | | | | | 74:4a:a4:00:0b:88 | | +| | | | | | | | | | vlan 103/ public | | +| | | | | | | | | | vlan 1020/ private | | ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ +| node2 | ZTE | E9000 | 289016500197 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.33 | | enp2s0f0: | | +| | | | | | | | 0C:12:62:E4:C0:33 | | 74:4a:a4:00:5c:5d | | +| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | +| | | | | | | | | | enp2s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:5e | | +| | | | | | | | | | vlan 101/ mgmt | | +| | | | | | | | | | enp132s0f0: | | +| | | | | | | | | | 74:4a:a4:00:5c:5f | | +| | | | | | | | | | vlan 102/ storage | | +| | | | | | | | | | enp132s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:60 | | +| | | | | | | | | | vlan 103/ public | | +| | | | | | | | | | vlan 1020/ private | | ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ +| node3 | ZTE | E9000 | 289016500003 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.34 | | enp2s0f0: | | +| | | | | | | | 74:4A:A4:00:30:93 | | 74:4a:a4:00:5c:35 | | +| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | +| | | | | | | | | | enp2s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:36 | | +| | | | | | | | | | vlan 101/ mgmt | | +| | | | | | | | | | enp132s0f0: | | +| | | | | | | | | | 74:4a:a4:00:5c:37 | | +| | | | | | | | | | vlan 102/ storage | | +| | | | | | | | | | enp132s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:38 | | +| | | | | | | | | | vlan 103/ public | | +| | | | | | | | | | vlan 1020/ private | | ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ +| node4 | ZTE | E9000 | 289016500105 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.35 | | enp2s0f0: | | +| | | | | | | | 0C:12:62:E4:C0:42 | | 74:4a:a4:00:5c:69 | | +| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | +| | | | | | | | | | enp2s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:6a | | +| | | | | | | | | | vlan 101/ mgmt | | +| | | | | | | | | | enp132s0f0: | | +| | | | | | | | | | 74:4a:a4:00:5c:6b | | +| | | | | | | | | | vlan 102/ storage | | +| | | | | | | | | | enp132s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:6c | | +| | | | | | | | | | vlan 103/ public | | +| | | | | | | | | | vlan 1020/ private | | ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ +| node5 | ZTE | E9000 | 289016500195 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.36 | | enp2s0f0: | | +| | | | | | | | 74:4A:A4:00:30:43 | | 74:4a:a4:00:5c:6d | | +| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | +| | | | | | | | | | enp2s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:6e | | +| | | | | | | | | | vlan 101/ mgmt | | +| | | | | | | | | | enp132s0f0: | | +| | | | | | | | | | 74:4a:a4:00:5c:6f | | +| | | | | | | | | | vlan 102/ storage | | +| | | | | | | | | | enp132s0f1: | | +| | | | | | | | | | 74:4a:a4:00:5c:70 | | +| | | | | | | | | | vlan 103/ public | | +| | | | | | | | | | vlan 1020/ private | | ++----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ + +**Subnet allocations** + ++----------------+--------------+----------------+------------+-----------------+ +| Network name | Address | Mask | Gateway | VLAN id | ++----------------+--------------+----------------+------------+-----------------+ +| Public | 172.10.0.0 | 255.255.255.0 | 172.10.0.1 | 103 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Admin/PXE | 10.20.0.0 | 255.255.255.0 | 10.20.0.1 | native valn 100 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Mangement | 192.168.11.0 | 255.255.255.0 | | 101 | ++----------------+--------------+----------------+------------+-----------------+ +| Fuel Storage | 192.168.12.0 | 255.255.255.0 | | 102 | ++----------------+--------------+----------------+------------+-----------------+ + + +VPN Users +--------- + ++--------------+--------------+--------------+--------------+--------------+ +| Name | Email | Project | Role | Notes | ++--------------+--------------+--------------+--------------+--------------+ +| | | | | | ++--------------+--------------+--------------+--------------+--------------+ + + +Firewall Rules +-------------- + ++---------------+---------+------+ +| Port(s) | Service | Note | ++---------------+---------+------+ +| 5000(OpenVPN) | Jenkins | | ++---------------+---------+------+ + + +POD Topology +------------ + +.. image:: ./images/zte_sh_pod_topology.png + :alt: POD diagram not found diff --git a/docs/labs/zte-sh-lab/pod-3.yaml b/docs/labs/zte-sh-lab/pod-3.yaml new file mode 100644 index 00000000..061c07cb --- /dev/null +++ b/docs/labs/zte-sh-lab/pod-3.yaml @@ -0,0 +1,47 @@ +nodes: + - name: node1 + tags: control + arch: "x86_64" + mac_address: "74:4a:a4:00:0b:85" + power: + type: ipmi + address: 192.168.1.32 + user: zteroot + pass: superuser + - name: node2 + tags: control + arch: "x86_64" + mac_address: "74:4a:a4:00:5c:5d" + power: + type: ipmi + address: 192.168.1.33 + user: zteroot + pass: superuser + - name: node3 + tags: control + arch: "x86_64" + mac_address: "74:4a:a4:00:5c:35" + power: + type: ipmi + address: 192.168.1.34 + user: zteroot + pass: superuser + - name: node4 + tags: compute + arch: "x86_64" + mac_address: "74:4a:a4:00:5c:69" + power: + type: ipmi + address: 192.168.1.35 + user: zteroot + pass: superuser + - name: node5 + tags: compute + arch: "x86_64" + mac_address: "74:4a:a4:00:5c:6d" + power: + type: ipmi + address: 192.168.1.36 + user: zteroot + pass: superuser + diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod1_description.rst deleted file mode 100644 index 7ec53a82..00000000 --- a/docs/labs/zte-sh-lab/pod1_description.rst +++ /dev/null @@ -1,160 +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: - -********************** -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 | 701763100025 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.101 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:cf:d9 | 74:4a:a4:00:cf:dc | 74:4a:a4:00:b0:e1 | | -| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:b0:e2 | | -| | | | | | | | | | vlan 162/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:b0:dd | | -| | | | | | | | | | vlan 1120/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:b0:de | | -| | | | | | | | | | vlan 163/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node2 | ZTE | E9000 | 701763100224 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.102 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:ce:cb | 74:4a:a4:00:ce:ce | 74:4a:a4:00:d6:ad | | -| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:ae | | -| | | | | | | | | | vlan 162/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d6:a9 | | -| | | | | | | | | | vlan 1120/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:aa | | -| | | | | | | | | | vlan 163/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node3 | ZTE | E9000 | 701763100064 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.103 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:cf:55 | 74:4a:a4:00:cf:58 | 74:4a:a4:00:d6:ab | | -| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:ac | | -| | | | | | | | | | vlan 162/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d6:af | | -| | | | | | | | | | vlan 1120/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:b0 | | -| | | | | | | | | | vlan 163/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node4 | ZTE | E9000 | 289842100103 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.104 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:49:81 | 74:4a:a4:00:49:84 | 74:4a:a4:00:b1:a5 | | -| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:b1:a6 | | -| | | | | | | | | | vlan 162/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:b1:b1 | | -| | | | | | | | | | vlan 1120/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:b1:b2 | | -| | | | | | | | | | vlan 163/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node5 | ZTE | E9000 | 701763100220 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.105 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:ce:bf | 74:4a:a4:00:ce:c2 | 74:4a:a4:00:d6:8d | | -| | | | | | | | zteroot/superuser | native vlan 160/PXE | vlan 161/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:8e | | -| | | | | | | | | | vlan 162/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d6:9b | | -| | | | | | | | | | vlan 1120/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:9c | | -| | | | | | | | | | vlan 163/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ - -**Subnet allocations** - -+----------------+--------------+----------------+------------+-----------------+ -| Network name | Address | Mask | Gateway | VLAN id | -+----------------+--------------+----------------+------------+-----------------+ -| Public | 172.60.0.0 | 255.255.255.0 | 172.60.0.1 | 163 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Admin/PXE | 10.20.6.0 | 255.255.255.0 | 10.20.6.2 | native vlan 160 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Mangement | 192.168.61.0 | 255.255.255.0 | | 161 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Storage | 192.168.62.0 | 255.255.255.0 | | 162 | -+----------------+--------------+----------------+------------+-----------------+ - - -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 deleted file mode 100644 index 3414bc12..00000000 --- a/docs/labs/zte-sh-lab/pod1_inventory.yaml +++ /dev/null @@ -1,46 +0,0 @@ -nodes: - - name: node1 - tags: control #optional param, other valid value "compute" - arch: "x86_64" - mac_address: "74:4A:A4:00:CF:DC" #pxe boot interface mac - power: - type: ipmi - address: 192.168.1.101 - user: zteroot - pass: superuser - - name: node2 - tags: control - arch: "x86_64" - mac_address: "74:4A:A4:00:CE:CE" - power: - type: ipmi - address: 192.168.1.102 - user: zteroot - pass: superuser - - name: node3 - tags: control - arch: "x86_64" - mac_address: "74:4A:A4:00:CF:58" - power: - type: ipmi - address: 192.168.1.103 - user: zteroot - pass: superuser - - name: node4 - tags: compute - arch: "x86_64" - mac_address: "74:4A:A4:00:49:84" - power: - type: ipmi - address: 192.168.1.104 - user: zteroot - pass: superuser - - name: node5 - tags: compute - arch: "x86_64" - mac_address: "74:4A:A4:00:CE:C2" - power: - type: ipmi - address: 192.168.1.105 - user: zteroot - pass: superuser diff --git a/docs/labs/zte-sh-lab/pod2_description.rst b/docs/labs/zte-sh-lab/pod2_description.rst deleted file mode 100644 index 961aa2a0..00000000 --- a/docs/labs/zte-sh-lab/pod2_description.rst +++ /dev/null @@ -1,162 +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: - -********************** -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 | | | -+-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+ - - -**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 | 701763100114 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.106 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:cd:6f | 74:4a:a4:00:cd:72 | 74:4a:a4:00:b0:e9 | | -| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:b0:ea | | -| | | | | | | | | | vlan 172/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:b0:eb | | -| | | | | | | | | | vlan 1130/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:b0:ec | | -| | | | | | | | | | vlan 173/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node2 | ZTE | E9000 | 701360500105 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.107 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:ca:c9 | 74:4a:a4:00:ca:cc | 74:4a:a4:00:d6:a3 | | -| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:a4 | | -| | | | | | | | | | vlan 172/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d6:99 | | -| | | | | | | | | | vlan 1130/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:9a | | -| | | | | | | | | | vlan 173/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node3 | ZTE | E9000 | 701360500026 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.108 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:cd:0f | 74:4a:a4:00:cd:12 | 74:4a:a4:00:d6:9d | | -| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:9e | | -| | | | | | | | | | vlan 172/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d3:15 | | -| | | | | | | | | | vlan 1130/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d3:16 | | -| | | | | | | | | | vlan 173/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node4 | ZTE | E9000 | 701763100099 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.109 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:cf:3d | 74:4a:a4:00:cf:40 | 74:4a:a4:00:d6:a5 | | -| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:a6 | | -| | | | | | | | | | vlan 172/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d6:a7 | | -| | | | | | | | | | vlan 1130/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d6:a8 | | -| | | | | | | | | | vlan 173/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ -| node5 | ZTE | E9000 | 701763100018 | E5-2650x2 | 128 | 600GB*2 HDD | 192.168.1.110 | ens4f0: | ens12f0: | | -| | | | | | | | 74:4a:a4:00:ce:d1 | 74:4a:a4:00:ce:d4 | 74:4a:a4:00:d2:c3 | | -| | | | | | | | zteroot/superuser | native vlan 170/PXE | vlan 171/ management | | -| | | | | | | | | | ens12f1: | | -| | | | | | | | | | 74:4a:a4:00:d2:c4 | | -| | | | | | | | | | vlan 172/ storage | | -| | | | | | | | | | ens44f0: | | -| | | | | | | | | | 74:4a:a4:00:d2:c1 | | -| | | | | | | | | | vlan 1130/ private | | -| | | | | | | | | | ens44f1: | | -| | | | | | | | | | 74:4a:a4:00:d2:c2 | | -| | | | | | | | | | vlan 173/ public | | -+----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+ - - -**Subnet allocations** - -+----------------+--------------+----------------+------------+-----------------+ -| Network name | Address | Mask | Gateway | VLAN id | -+----------------+--------------+----------------+------------+-----------------+ -| Public | 172.70.0.0 | 255.255.255.0 | 172.70.0.1 | 173 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Admin | 10.20.7.0 | 255.255.255.0 | 10.20.7.1 | native vlan 170 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Mangement | 192.168.71.0 | 255.255.255.0 | | 171 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Storage | 192.168.72.0 | 255.255.255.0 | | 172 | -+----------------+--------------+----------------+------------+-----------------+ - - -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 deleted file mode 100644 index a49ac190..00000000 --- a/docs/labs/zte-sh-lab/pod2_inventory.yaml +++ /dev/null @@ -1,46 +0,0 @@ -nodes: - - name: node1 - tags: control #optional param, other valid value "compute" - arch: "x86_64" - mac_address: "74:4A:A4:00:CD:72" #pxe boot interface mac - power: - type: ipmi - address: 192.168.1.106 - user: zteroot - pass: superuser - - name: node2 - tags: control - arch: "x86_64" - mac_address: "74:4A:A4:00:CA:CC" - power: - type: ipmi - address: 192.168.1.107 - user: zteroot - pass: superuser - - name: node3 - tags: control - arch: "x86_64" - mac_address: "74:4A:A4:00:CD:12" - power: - type: ipmi - address: 192.168.1.108 - user: zteroot - pass: superuser - - name: node4 - tags: compute - arch: "x86_64" - mac_address: "74:4A:A4:00:CF:40" - power: - type: ipmi - address: 192.168.1.109 - user: zteroot - pass: superuser - - name: node5 - tags: compute - arch: "x86_64" - mac_address: "74:4A:A4:00:CE:D4" - power: - type: ipmi - address: 192.168.1.110 - user: zteroot - pass: superuser diff --git a/docs/labs/zte-sh-lab/pod3_description.rst b/docs/labs/zte-sh-lab/pod3_description.rst deleted file mode 100644 index f0cfae7b..00000000 --- a/docs/labs/zte-sh-lab/pod3_description.rst +++ /dev/null @@ -1,163 +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: - -************************* -ZTE SH POD3 Specification -************************* - - -Introduction ------------- - -POD3(means ZTE-POD3) uses Fuel as the installer and performs os-nosdn-kvm-ha CI latest verification. -Feature projects like NFV-KVMV, OVSNFV will be run in this POD. - - -Additional Requirements ------------------------ - - -Server Specifications ---------------------- - -**Jump Host** - -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** - -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ -| | | | | | 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 | 289016500203 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.32 | | enp2s0f0: | | -| | | | | | | | 0c:12:62:e4:bf:de | | 74:4a:a4:00:0b:85 | | -| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | -| | | | | | | | | | enp2s0f1: | | -| | | | | | | | | | 74:4a:a4:00:0b:86 | | -| | | | | | | | | | vlan 101/ mgmt | | -| | | | | | | | | | enp132s0f0: | | -| | | | | | | | | | 74:4a:a4:00:0b:87 | | -| | | | | | | | | | vlan 102/ storage | | -| | | | | | | | | | enp132s0f1: | | -| | | | | | | | | | 74:4a:a4:00:0b:88 | | -| | | | | | | | | | vlan 103/ public | | -| | | | | | | | | | vlan 1020/ private | | -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ -| node2 | ZTE | E9000 | 289016500197 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.33 | | enp2s0f0: | | -| | | | | | | | 0C:12:62:E4:C0:33 | | 74:4a:a4:00:5c:5d | | -| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | -| | | | | | | | | | enp2s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:5e | | -| | | | | | | | | | vlan 101/ mgmt | | -| | | | | | | | | | enp132s0f0: | | -| | | | | | | | | | 74:4a:a4:00:5c:5f | | -| | | | | | | | | | vlan 102/ storage | | -| | | | | | | | | | enp132s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:60 | | -| | | | | | | | | | vlan 103/ public | | -| | | | | | | | | | vlan 1020/ private | | -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ -| node3 | ZTE | E9000 | 289016500003 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.34 | | enp2s0f0: | | -| | | | | | | | 74:4A:A4:00:30:93 | | 74:4a:a4:00:5c:35 | | -| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | -| | | | | | | | | | enp2s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:36 | | -| | | | | | | | | | vlan 101/ mgmt | | -| | | | | | | | | | enp132s0f0: | | -| | | | | | | | | | 74:4a:a4:00:5c:37 | | -| | | | | | | | | | vlan 102/ storage | | -| | | | | | | | | | enp132s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:38 | | -| | | | | | | | | | vlan 103/ public | | -| | | | | | | | | | vlan 1020/ private | | -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ -| node4 | ZTE | E9000 | 289016500105 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.35 | | enp2s0f0: | | -| | | | | | | | 0C:12:62:E4:C0:42 | | 74:4a:a4:00:5c:69 | | -| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | -| | | | | | | | | | enp2s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:6a | | -| | | | | | | | | | vlan 101/ mgmt | | -| | | | | | | | | | enp132s0f0: | | -| | | | | | | | | | 74:4a:a4:00:5c:6b | | -| | | | | | | | | | vlan 102/ storage | | -| | | | | | | | | | enp132s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:6c | | -| | | | | | | | | | vlan 103/ public | | -| | | | | | | | | | vlan 1020/ private | | -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ -| node5 | ZTE | E9000 | 289016500195 | E5-2670x2 | 64 | 600GB HDD | 192.168.1.36 | | enp2s0f0: | | -| | | | | | | | 74:4A:A4:00:30:43 | | 74:4a:a4:00:5c:6d | | -| | | | | | | | zteroot/superuser | | vlan 100/ Admin(PXE) | | -| | | | | | | | | | enp2s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:6e | | -| | | | | | | | | | vlan 101/ mgmt | | -| | | | | | | | | | enp132s0f0: | | -| | | | | | | | | | 74:4a:a4:00:5c:6f | | -| | | | | | | | | | vlan 102/ storage | | -| | | | | | | | | | enp132s0f1: | | -| | | | | | | | | | 74:4a:a4:00:5c:70 | | -| | | | | | | | | | vlan 103/ public | | -| | | | | | | | | | vlan 1020/ private | | -+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+------------------+----------------------+-------+ - -**Subnet allocations** - -+----------------+--------------+----------------+------------+-----------------+ -| Network name | Address | Mask | Gateway | VLAN id | -+----------------+--------------+----------------+------------+-----------------+ -| Public | 172.10.0.0 | 255.255.255.0 | 172.10.0.1 | 103 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Admin/PXE | 10.20.0.0 | 255.255.255.0 | 10.20.0.1 | native valn 100 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Mangement | 192.168.11.0 | 255.255.255.0 | | 101 | -+----------------+--------------+----------------+------------+-----------------+ -| Fuel Storage | 192.168.12.0 | 255.255.255.0 | | 102 | -+----------------+--------------+----------------+------------+-----------------+ - - -VPN Users ---------- - -+--------------+--------------+--------------+--------------+--------------+ -| Name | Email | Project | Role | Notes | -+--------------+--------------+--------------+--------------+--------------+ -| | | | | | -+--------------+--------------+--------------+--------------+--------------+ - - -Firewall Rules --------------- - -+---------------+---------+------+ -| Port(s) | Service | Note | -+---------------+---------+------+ -| 5000(OpenVPN) | Jenkins | | -+---------------+---------+------+ - - -POD Topology ------------- - -.. image:: ./images/zte_sh_pod_topology.png - :alt: POD diagram not found diff --git a/docs/labs/zte-sh-lab/pod3_inventory.yaml b/docs/labs/zte-sh-lab/pod3_inventory.yaml deleted file mode 100644 index 061c07cb..00000000 --- a/docs/labs/zte-sh-lab/pod3_inventory.yaml +++ /dev/null @@ -1,47 +0,0 @@ -nodes: - - name: node1 - tags: control - arch: "x86_64" - mac_address: "74:4a:a4:00:0b:85" - power: - type: ipmi - address: 192.168.1.32 - user: zteroot - pass: superuser - - name: node2 - tags: control - arch: "x86_64" - mac_address: "74:4a:a4:00:5c:5d" - power: - type: ipmi - address: 192.168.1.33 - user: zteroot - pass: superuser - - name: node3 - tags: control - arch: "x86_64" - mac_address: "74:4a:a4:00:5c:35" - power: - type: ipmi - address: 192.168.1.34 - user: zteroot - pass: superuser - - name: node4 - tags: compute - arch: "x86_64" - mac_address: "74:4a:a4:00:5c:69" - power: - type: ipmi - address: 192.168.1.35 - user: zteroot - pass: superuser - - name: node5 - tags: compute - arch: "x86_64" - mac_address: "74:4a:a4:00:5c:6d" - power: - type: ipmi - address: 192.168.1.36 - user: zteroot - pass: superuser - -- cgit 1.2.3-korg