From aa88673c38be12368dead5e8241fb915d790c431 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 17 Aug 2017 21:32:10 +0800 Subject: restruct documents according to opnfvdocs Use only development and release for we don't have test codes for now. JIRA: PHAROS-311 Change-Id: Iacfcaba81a7a52e09cf999b8603cc9dc2f8f2b97 Signed-off-by: Julien --- .../labs/zte-sh-lab/images/zte_sh_lab_topology.png | Bin 223339 -> 0 bytes .../labs/zte-sh-lab/images/zte_sh_pod_topology.png | Bin 125873 -> 0 bytes docs/labs/zte-sh-lab/index.rst | 20 --- docs/labs/zte-sh-lab/lab_description.rst | 127 ---------------- docs/labs/zte-sh-lab/pod-1.rst | 160 -------------------- docs/labs/zte-sh-lab/pod-1.yaml | 56 ------- docs/labs/zte-sh-lab/pod-2.rst | 162 -------------------- docs/labs/zte-sh-lab/pod-2.yaml | 56 ------- docs/labs/zte-sh-lab/pod-3.rst | 163 --------------------- docs/labs/zte-sh-lab/pod-3.yaml | 56 ------- 10 files changed, 800 deletions(-) delete mode 100644 docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png delete mode 100644 docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png delete mode 100644 docs/labs/zte-sh-lab/index.rst delete mode 100644 docs/labs/zte-sh-lab/lab_description.rst delete mode 100644 docs/labs/zte-sh-lab/pod-1.rst delete mode 100644 docs/labs/zte-sh-lab/pod-1.yaml delete mode 100644 docs/labs/zte-sh-lab/pod-2.rst delete mode 100644 docs/labs/zte-sh-lab/pod-2.yaml delete mode 100644 docs/labs/zte-sh-lab/pod-3.rst delete mode 100644 docs/labs/zte-sh-lab/pod-3.yaml (limited to 'docs/labs/zte-sh-lab') 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 deleted file mode 100644 index 6c147dbc..00000000 Binary files a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png and /dev/null differ diff --git a/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png b/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png deleted file mode 100644 index 592b6077..00000000 Binary files a/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png and /dev/null differ diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst deleted file mode 100644 index 9a8d7f56..00000000 --- a/docs/labs/zte-sh-lab/index.rst +++ /dev/null @@ -1,20 +0,0 @@ -.. _pharos-zte-sh-lab: - -.. 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 SH Pharos Lab Configuration Files -************************************* - - -.. toctree:: - :maxdepth: 2 - - ./lab_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 deleted file mode 100644 index 0d9d2dd0..00000000 --- a/docs/labs/zte-sh-lab/lab_description.rst +++ /dev/null @@ -1,127 +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_lab: - -************************ -ZTE SH Lab Specification -************************ - - -Introduction ------------- - -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 dedicated for use by 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: - -- os-nosdn-kvm-ha -- os-nosdn-kvm_ovs-ha - -Scenarios are defined in -`Colorado Scenario Status `_ - - -Lab Resources -------------- - -+----------+------------+-----------+-------------------------+------------+--------+-----------+ -| 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 `_ -* `POD1 jenkins slave `_ -* `POD2 jenkins slave `_ -- `POD3 jenkins slave `_ - - -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 these PODs. - - -Remote Access Infrastructure ----------------------------- - -ZTE SH lab provide the OpenVPN access for you. - - -Remote Access Procedure ------------------------ - -Access to this environment can be granted by sending an e-mail to: **yangyang1@zte.com.cn**. - -Subject: opnfv zte-pod[1-3] access. - -The following information should be provided in the request: - -:: - - Full name: - E-mail: - Organization: - Why is access needed: - How long is access needed: - What specific 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. - - -Lab Documentation ------------------ - - -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 ZTE -Pharos Lab. Deploy servers are separated from Jump Host. Each POD has itsown **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/pod-1.rst b/docs/labs/zte-sh-lab/pod-1.rst deleted file mode 100644 index 7ec53a82..00000000 --- a/docs/labs/zte-sh-lab/pod-1.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/pod-1.yaml b/docs/labs/zte-sh-lab/pod-1.yaml deleted file mode 100644 index b8bee5d8..00000000 --- a/docs/labs/zte-sh-lab/pod-1.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -############################################################################## -## Copyright (c) 2015 ZTE Corp. and others. -## -## All rights reserved. This program and the accompanying materials -## are made available under the terms of the Apache License, Version 2.0 -## which accompanies this distribution, and is available at -## http://www.apache.org/licenses/LICENSE-2.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/pod-2.rst b/docs/labs/zte-sh-lab/pod-2.rst deleted file mode 100644 index 961aa2a0..00000000 --- a/docs/labs/zte-sh-lab/pod-2.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/pod-2.yaml b/docs/labs/zte-sh-lab/pod-2.yaml deleted file mode 100644 index c56b53db..00000000 --- a/docs/labs/zte-sh-lab/pod-2.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -############################################################################## -## Copyright (c) 2015 ZTE Corp. and others. -## -## All rights reserved. This program and the accompanying materials -## are made available under the terms of the Apache License, Version 2.0 -## which accompanies this distribution, and is available at -## http://www.apache.org/licenses/LICENSE-2.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/pod-3.rst b/docs/labs/zte-sh-lab/pod-3.rst deleted file mode 100644 index f0cfae7b..00000000 --- a/docs/labs/zte-sh-lab/pod-3.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/pod-3.yaml b/docs/labs/zte-sh-lab/pod-3.yaml deleted file mode 100644 index 409be27e..00000000 --- a/docs/labs/zte-sh-lab/pod-3.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -############################################################################## -## Copyright (c) 2015 ZTE Corp. and others. -## -## All rights reserved. This program and the accompanying materials -## are made available under the terms of the Apache License, Version 2.0 -## which accompanies this distribution, and is available at -## http://www.apache.org/licenses/LICENSE-2.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