diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | docs/labs/index.rst | 1 | ||||
| -rw-r--r-- | docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png | bin | 84145 -> 0 bytes | |||
| -rw-r--r-- | docs/labs/zte-nj-lab/index.rst | 16 | ||||
| -rw-r--r-- | docs/labs/zte-nj-lab/lab_description.rst | 86 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png | bin | 241260 -> 223339 bytes | |||
| -rw-r--r-- | docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png (renamed from docs/labs/zte-sh-lab/images/zte_sh_pod3_topology.png) | bin | 125873 -> 125873 bytes | |||
| -rw-r--r-- | docs/labs/zte-sh-lab/index.rst | 3 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/lab_description.rst | 68 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod1_description.rst (renamed from docs/labs/zte-nj-lab/pod1_description.rst) | 28 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod1_inventory.yaml (renamed from docs/labs/zte-nj-lab/pod1_inventory.yaml) | 0 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod2_description.rst (renamed from docs/labs/zte-nj-lab/pod2_description.rst) | 30 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod2_inventory.yaml (renamed from docs/labs/zte-nj-lab/pod2_inventory.yaml) | 0 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod3_description.rst | 28 |
14 files changed, 115 insertions, 148 deletions
@@ -61,3 +61,6 @@ target/ /docs_build/ /docs_output/ /releng/ + +# macos preview +.DS_Store diff --git a/docs/labs/index.rst b/docs/labs/index.rst index 2d6ece49..d787e70b 100755 --- a/docs/labs/index.rst +++ b/docs/labs/index.rst @@ -16,5 +16,4 @@ PHAROS Community Labs ./ool/index.rst ./orange-paris-lab/index.rst ./spirent.rst - ./zte-nj-lab/index.rst ./zte-sh-lab/index.rst 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 Binary files differdeleted file mode 100644 index 5885fc6e..00000000 --- a/docs/labs/zte-nj-lab/images/zte_nj_lab_topology.png +++ /dev/null diff --git a/docs/labs/zte-nj-lab/index.rst b/docs/labs/zte-nj-lab/index.rst deleted file mode 100644 index 94fb322f..00000000 --- a/docs/labs/zte-nj-lab/index.rst +++ /dev/null @@ -1,16 +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. - -.. 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/lab_description.rst b/docs/labs/zte-nj-lab/lab_description.rst deleted file mode 100644 index 0bb74933..00000000 --- a/docs/labs/zte-nj-lab/lab_description.rst +++ /dev/null @@ -1,86 +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 NJ Lab Specification -************************ - - -Introduction ------------- - -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) | PTL(s) | Email(s) | POD Role | Status | Notes | -+----------+------------+-----------+-------------------------+------------+--------+-----------+ -| POD1 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Yardstick | -| | | Elkinbard | | | | Funtest | -| | | | | | | Doctor | -| | | | | | | Parser | -+----------+------------+-----------+-------------------------+------------+--------+-----------+ -| POD2 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Qtip | -| | | Elkinbard | | | | | -+----------+------------+-----------+-------------------------+------------+--------+-----------+ - -* `POD1/POD2 wiki <https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab>`_ -* `POD1 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod1/>`_ -* `POD2 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod2/>`_ - - -Acceptable Usage Policy ------------------------ - -Resources located in OPNFV ZTE NJ Lab shall only be used for CI, infra setup/configuration and -troubleshooting purposes. No development work is allowed in these PODs. - - -Remote Access Infrastructure ----------------------------- - -ZTE lab provide the OpenVPN access for you. - - -Remote Access Procedure ------------------------ - -Access to this environment can be granted by sending an e-mail to:"wu.zhihui1@zte.com.cn" - -Subject: opnfv zte-pod[1-2] 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 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. - - -Lab Documentation ------------------ - - -Lab Topology ------------- - -.. image:: ./images/zte_nj_lab_topoloy.png - :alt: POD diagram not found 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 Binary files differindex 5c2576df..6c147dbc 100644 --- a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png +++ b/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png diff --git a/docs/labs/zte-sh-lab/images/zte_sh_pod3_topology.png b/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png Binary files differindex 592b6077..592b6077 100644 --- a/docs/labs/zte-sh-lab/images/zte_sh_pod3_topology.png +++ b/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst index e48c21d4..f8ee36ed 100644 --- a/docs/labs/zte-sh-lab/index.rst +++ b/docs/labs/zte-sh-lab/index.rst @@ -10,6 +10,9 @@ ZTE SH Pharos Lab Configuration Files .. toctree:: + :maxdepth: 2 ./lab_description.rst + ./pod1_description.rst + ./pod2_description.rst ./pod3_description.rst diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst index bb125f1e..f6224855 100644 --- a/docs/labs/zte-sh-lab/lab_description.rst +++ b/docs/labs/zte-sh-lab/lab_description.rst @@ -12,9 +12,10 @@ ZTE SH Lab Specification Introduction ------------ -ZTE SH Pharos lab currently has one POD available in Shanghai. The POD has 5 servers, 3 controller -nodes and 2 computer nodes. It is dedicatedly used for baremetal CI. The POD is supposed to support -scenarios related with performance enhancement projects, such as KVM, OVS, FDS, etc. +ZTE SH Pharos lab currently has three PODs available in Shanghai. Each POD has 5 servers, 3 +controller nodes and 2 computer nodes. These PODs are dedicatedly used for Production/CI. These PODs +focus scenarios related with **test** projects, **installer** projects and performance enhancement +projects, such as KVM, OVS, FDS, etc. Scenarios planned are list here: @@ -28,14 +29,24 @@ Scenarios are defined in Lab Resources ------------- -+----------+------------+-----------+-------------------------+------------+--------+---------+ -| POD Name | Project(s) | PTL(s) | Email(s) | POD Role | Status | Notes | -+----------+------------+-----------+-------------------------+------------+--------+---------+ -| POD3 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | NFV-KVM | -| | | Elkinbard | | | | OVSNFV | -+----------+------------+-----------+-------------------------+------------+--------+---------+ - -- `POD3 wiki page <https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab>`_ ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD Name | Project(s) | PTL(s) | Email(s) | POD Role | Status | Notes | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD1 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Yardstick | +| | | Elkinbard | | | | Funtest | +| | | | | | | Doctor | +| | | | | | | Parser | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD2 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | Qtip | +| | | Elkinbard | | | | | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ +| POD3 | FUEL | Gregory | gelkinbard@mirantis.com | CI: latest | Active | NFV-KVM | +| | | Elkinbard | | | | OVSNFV | ++----------+------------+-----------+-------------------------+------------+--------+-----------+ + +- `POD1-3 wiki page <https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab>`_ +* `POD1 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod1/>`_ +* `POD2 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod2/>`_ - `POD3 jenkins slave <https://build.opnfv.org/ci/computer/zte-pod3/>`_ @@ -43,7 +54,7 @@ Acceptable Usage Policy ----------------------- Resources located in OPNFV ZTE SH lab shall only be used for CI, infra setup/configuration and -troubleshooting purposes. No development work is allowed in this Lab. +troubleshooting purposes. No development work is allowed in these PODs. Remote Access Infrastructure @@ -57,7 +68,7 @@ Remote Access Procedure Access to this environment can be granted by sending an e-mail to: **yangyang1@zte.com.cn**. -Subject: opnfv zte-pod3 access. +Subject: opnfv zte-pod[1-3] access. The following information should be provided in the request: @@ -83,3 +94,34 @@ Lab Topology .. image:: ./images/zte_sh_lab_topology.png :alt: Lab diagram not found + +All the PODs share the same **Jump Host** for only one public IP address is allocated for the +pharos lab. Deploy servers are separated from Jump Host. Every 2 PODs share one **Deploy Server**. + +**Jump Host** + ++----------+--------+-------+---------------+---------+--------+-----------+--------------------+------------------+-------+ +| | | | | | Memory | Local | 1GbE: NIC#/IP | 10GbE: NIC#/IP | | +| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | MAC/VLAN/Network | MAC/VLAN/Network | Notes | ++----------+--------+-------+---------------+---------+--------+-----------+--------------------+------------------+-------+ +| Rabbit | HP | 5500 | - | X5647x2 | 24 | 250GB SAS | IF0: | | | +| | | | | | | 2 TB HDD | a0:36:9f:00:11:34/ | | | +| | | | | | | | 192.168.1.1/ | | | +| | | | | | | | native vlan/OA | | | +| | | | | | | | IF1: | | | +| | | | | | | | a0:36:9f:00:11:35/ | | | +| | | | | | | | 172.10.0.1/ | | | +| | | | | | | | vlan 103/Public | | | +| | | | | | | | 172.20.0.1/ | | | +| | | | | | | | vlan 113/Public | | | +| | | | | | | | 172.60.0.1/ | | | +| | | | | | | | vlan 163/Public | | | +| | | | | | | | 172.70.0.1/ | | | +| | | | | | | | vlan 173/Public | | | +| | | | | | | | IF2: | | | +| | | | | | | | a0.36:9:00:11:37/ | | | +| | | | | | | | 116.228.53.183/ | | | +| | | | | | | | native vlan/ | | | +| | | | | | | | Internet | | | ++----------+--------+-------+---------------+---------+--------+-----------+--------------------+------------------+-------+ + diff --git a/docs/labs/zte-nj-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod1_description.rst index 05acb567..27666308 100644 --- a/docs/labs/zte-nj-lab/pod1_description.rst +++ b/docs/labs/zte-sh-lab/pod1_description.rst @@ -27,15 +27,23 @@ Server Specifications **Jump Host** -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ -| | | | | | Memory | Local | 1GbE: NIC#/IP | 10GbE: NIC#/IP | | -| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | MAC/VLAN/Network | MAC/VLAN/Network | Notes | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ -| Frog | ZTE | R4300 | 277662500093 | E5-2620x2 | 32 | 600GB HDD | IF0: 10.20.0.1 | | | -| | | | | | | | 98:F5:37:E1:B4:1C | | | -| | | | | | | | vlan 1 | | | -| | | | | | | | PXE | | | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ +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** @@ -123,5 +131,5 @@ Firewall Rules POD Topology ------------ -.. image:: ./images/zte_nj_pod1_topology.png +.. image:: ./images/zte_sh_pod_topology.png :alt: POD diagram not found diff --git a/docs/labs/zte-nj-lab/pod1_inventory.yaml b/docs/labs/zte-sh-lab/pod1_inventory.yaml index 5ceb0dbd..5ceb0dbd 100644 --- a/docs/labs/zte-nj-lab/pod1_inventory.yaml +++ b/docs/labs/zte-sh-lab/pod1_inventory.yaml diff --git a/docs/labs/zte-nj-lab/pod2_description.rst b/docs/labs/zte-sh-lab/pod2_description.rst index a03ecd1a..1931ba56 100644 --- a/docs/labs/zte-nj-lab/pod2_description.rst +++ b/docs/labs/zte-sh-lab/pod2_description.rst @@ -24,21 +24,27 @@ Additional Requirements Server Specifications --------------------- - **Jump Host** -POD2 share the same **Jump Host** with POD1: +POD2 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 | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ -| Frog | ZTE | R4300 | 277662500093 | E5-2620x2 | 32 | 600GB HDD | IF0: 10.20.0.1 | | | -| | | | | | | | 98:F5:37:E1:B4:1C | | | -| | | | | | | | VLAN 1 | | | -| | | | | | | | PXE | | | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ +POD2 share the same **Deploy Server** with POD1. ++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+ +| | | | | | Memory | Local | 1GbE: NIC#/IP | 10GbE: NIC#/IP | | +| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | MAC/VLAN/Network | MAC/VLAN/Network | Notes | ++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+ +| Jellyfish | ZTE | R5300 | 277662500093 | E5-2620x2 | 128 | 600GB SAS | IF0: | | | +| | | | | | | 4 TB HDD | 74:4a:a4:00:91:b3/ | | | +| | | | | | | | 10.20.6.1/ | | | +| | | | | | | | native vlan/PXE | | | +| | | | | | | | IF1: | | | +| | | | | | | | 74:4a:a4:00:91:b4/ | | | +| | | | | | | | 10.20.7.1/ | | | +| | | | | | | | native vlan/PXE | | | ++-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+ **Compute Nodes** @@ -126,5 +132,5 @@ Firewall Rules POD Topology ------------ -.. image:: ./zte_nj_pod2_topology.png +.. image:: ./images/zte_sh_pod_topology.png :alt: POD diagram not found diff --git a/docs/labs/zte-nj-lab/pod2_inventory.yaml b/docs/labs/zte-sh-lab/pod2_inventory.yaml index c060a78f..c060a78f 100644 --- a/docs/labs/zte-nj-lab/pod2_inventory.yaml +++ b/docs/labs/zte-sh-lab/pod2_inventory.yaml diff --git a/docs/labs/zte-sh-lab/pod3_description.rst b/docs/labs/zte-sh-lab/pod3_description.rst index fdc32d16..f0cfae7b 100644 --- a/docs/labs/zte-sh-lab/pod3_description.rst +++ b/docs/labs/zte-sh-lab/pod3_description.rst @@ -25,15 +25,23 @@ Server Specifications **Jump Host** -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ -| | | | | | Memory | Local | 1GbE: NIC#/IP | 10GbE: NIC#/IP | | -| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | MAC/VLAN/Network | MAC/VLAN/Network | Notes | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ -| Frog | ZTE | R5300 | 210077307607 | E5-2609x2 | 32 | 600GB SAS | IF0: 10.20.0.1 | | | -| | | | | | | 2TB HDD | 74:4a:a4:00:21:0b | | | -| | | | | | | | vlan 100/PXE | | | -| | | | | | | | | | | -+----------+--------+-------+---------------+-----------+--------+-----------+-------------------+------------------+-------+ +POD3 share the same **Jump Host** in the lab. + +**Deploy Server** + ++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+ +| | | | | | Memory | Local | 1GbE: NIC#/IP | 10GbE: NIC#/IP | | +| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | MAC/VLAN/Network | MAC/VLAN/Network | Notes | ++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+ +| Spider | ZTE | R5300 | 210077307607 | E5-2609x1 | 32 | 600GB SAS | IF0: | | | +| | | | | | | 1.2TB SCSI | 74:4a:a4:00:21:0b/ | | | +| | | | | | | | 10.20.0.1/ | | | +| | | | | | | | native vlan/PXE | | | +| | | | | | | | IF1: | | | +| | | | | | | | 74:4a:a4:00:21:0c/ | | | +| | | | | | | | 10.20.1.1/ | | | +| | | | | | | | native vlan/PXE | | | ++----------+--------+-------+---------------+-----------+--------+------------+--------------------+------------------+-------+ **Compute Nodes** @@ -151,5 +159,5 @@ Firewall Rules POD Topology ------------ -.. image:: ./images/zte_sh_pod3_topology.png +.. image:: ./images/zte_sh_pod_topology.png :alt: POD diagram not found |
