diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | docs/configguide/index.rst | 30 | ||||
| -rw-r--r-- | docs/configguide/pharosconfig.rst | 25 | ||||
| -rwxr-xr-x | docs/index.rst | 17 | ||||
| -rw-r--r-- | docs/information/index.rst | 14 | ||||
| -rw-r--r-- | docs/information/pharos.rst | 42 | ||||
| -rw-r--r-- | docs/lab-description/index.rst (renamed from docs/lab-description/templates.rst) | 10 | ||||
| -rwxr-xr-x | docs/labs/index.rst | 19 | ||||
| -rw-r--r-- | docs/labs/ool/index.rst (renamed from docs/labs/ool/ool.rst) | 0 | ||||
| -rw-r--r-- | docs/labs/orange-paris-lab/index.rst (renamed from docs/labs/orange-paris-lab/orange_paris.rst) | 0 | ||||
| -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/lab_description.rst | 86 | ||||
| -rw-r--r-- | docs/labs/zte-nj-lab/zte-nj.rst | 16 | ||||
| -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 (renamed from docs/labs/zte-sh-lab/zte-sh.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 |
22 files changed, 208 insertions, 211 deletions
@@ -61,3 +61,6 @@ target/ /docs_build/ /docs_output/ /releng/ + +# macos preview +.DS_Store diff --git a/docs/configguide/index.rst b/docs/configguide/index.rst new file mode 100644 index 00000000..c51f029b --- /dev/null +++ b/docs/configguide/index.rst @@ -0,0 +1,30 @@ +.. 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 configuration documents. + +******************** +Pharos Configuration +******************** + +OPNFV development, test and production activities rely on Pharos resources and support from the +Pharos community. Lab owners and Pharos project committers/contributors will evolve the vision for +Pharos as well as expand lab capabilities that are needed to help OPNFV be highly successful. + +Pharos configuration documents provide information on how to setup hardware and networks in a +Pharos compliant lab. Jira is used to track Pharos activities including lab operations. Lab +resources can be used for and declared as either *Development (bare-metal or virtual)* or +*Production/CI (bare-metal or virtual)*. If a resource is used for and declared as *Development* +resource, it can not be used for and declared as *Production/CI* resource at the same time and vice +versa. Changing the resource declation must be brought in to Infra WG. Production/CI PODs are +required to be connected to OPNFV Jenkins and available on a 24/7 basis other than scheduled +maintenance and troubleshooting. Jenkins slave status can be seen on `Jenkins dashboard +https://build.opnfv.org/ci/computer/`. + +.. toctree:: + :maxdepth: 2 + + ./configguide.rst + ./lab_update_guide.rst + ./jumpserverinstall.rst diff --git a/docs/configguide/pharosconfig.rst b/docs/configguide/pharosconfig.rst deleted file mode 100644 index 6b48100a..00000000 --- a/docs/configguide/pharosconfig.rst +++ /dev/null @@ -1,25 +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 configuration documents. - -******************** -Pharos Configuration -******************** - -OPNFV development, test and production activities rely on Pharos resources and support from the -Pharos community. Lab owners and Pharos project committers/contributors will evolve the vision for -Pharos as well as expand lab capabilities that are needed to help OPNFV be highly successful. - -Pharos configuration documents provide information on how to setup hardware and networks in a Pharos -compliant lab. Jira is used to track Pharos activities including lab operations. PODs are connected -to Jenkins and generally available 24/7 other than scheduled maintenance and troubleshooting. Lab -resources are declared as either for *Development (bare-metal or virtual)*, *Production latest -(bare-metal)* or *Production stable (bare-metal)* - -.. toctree:: - - ./configguide.rst - ./lab_update_guide.rst - ./jumpserverinstall.rst diff --git a/docs/index.rst b/docs/index.rst index 36b48f52..94844fa9 100755 --- a/docs/index.rst +++ b/docs/index.rst @@ -17,19 +17,12 @@ OPNFV Community Lab Infrastructure :maxdepth: 3 :numbered: 3 - ./information/pharos.rst - ./specification/pharosspec.rst - ./lab-description/templates.rst - ./configguide/pharosconfig.rst - ./labs/Dell.rst - ./labs/huawei-us-lab/huawei-us-lab.rst - ./labs/ool/ool.rst - ./labs/orange-paris-lab/orange_paris.rst - ./labs/spirent.rst - ./labs/zte-nj-lab/zte-nj.rst - ./labs/zte-sh-lab/zte-sh.rst + ./information/index.rst + ./specification/index.rst + ./lab-description/index.rst + ./configguide/index.rst + ./labs/index.rst Indices ======= * :ref:`search` - diff --git a/docs/information/index.rst b/docs/information/index.rst new file mode 100644 index 00000000..0311526a --- /dev/null +++ b/docs/information/index.rst @@ -0,0 +1,14 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2016 OPNFV. + + +************************** +Pharos Project Information +************************** + + +.. toctree:: + :maxdepth: 2 + + ./pharos.rst diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst index 24e46d97..1679e380 100644 --- a/docs/information/pharos.rst +++ b/docs/information/pharos.rst @@ -2,13 +2,6 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) 2016 OPNFV. -.. OPNFV Pharos Project Information file. - -.. _pharos_information: - -************************** -Pharos Project Information -************************** Introduction ------------ @@ -30,28 +23,31 @@ federated lab infrastructure continues to be an objective. Virtual environments provided by some labs. Jira is currently used for tracking lab operational issues as well as for Pharos project activities. -Future lab capabilities are currently focussed on 1) Deployment automation 2) Dashboards (for -capability and usage) 3) *Virtual Labs* for developer on-boarding. +Future lab capabilities are currently focused on: -* `Pharos page <https://www.opnfv.org/developers/pharos>`_ -* `Pharos project Wiki <https://wiki.opnfv.org/display/pharos>`_ -* `Pharos Planning <https://wiki.opnfv.org/display/pharos/Pharos+Colorado+Plan>`_ +1) Automatic resource provisioning +2) Dashboards (for capability and usage) +3) *Virtual Labs* for developer on-boarding Project Communication --------------------- -* `Jira <https://jira.opnfv.org/projects/PHAROS/summary>`_ -* `Weekly Pharos meeting <https://wiki.opnfv.org/display/INF/Infra+Working+Group>`_ +* `Pharos page <https://www.opnfv.org/developers/pharos>`_ +* `Pharos project Wiki <https://wiki.opnfv.org/display/pharos>`_ +* `Pharos Planning <https://wiki.opnfv.org/display/pharos/Pharos+Colorado+Plan>`_ +* `Pharos Jira <https://jira.opnfv.org/projects/PHAROS/summary>`_ +* `Bi-weekly Pharos meeting <https://wiki.opnfv.org/display/pharos/Pharos+Meetings>`_ +* `Weekly INFRA WG meeting <https://wiki.opnfv.org/display/INF/Infra+Working+Group>`_ * `Weekly coordination meeting for Test related projects <https://wiki.opnfv.org/meetings/test>`_ -* IRC: freenode.net #opnfv-pharos http://webchat.freenode.net/?channels=opnfv-pharos +* `IRC: freenode.net #opnfv-pharos <http://webchat.freenode.net/?channels=opnfv-pharos>`_ * Mailing List: use opnfv-tech-discuss and tag your emails with [Pharos] in the subject for filtering Project Release Artifacts ------------------------- -* Project Repository: https://gerrit.opnfv.org/gerrit/#/q/pharos -* Continuous Integration https://build.opnfv.org/ci/view/pharos/ -* Documentation: http://artifacts.opnfv.org/pharos/docs/ +* `Project Repository <https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git>`_ +* `Continuous Integration <https://build.opnfv.org/ci/view/pharos/>`_ +* `Documentation <http://artifacts.opnfv.org/pharos/docs/>`_ Pharos Lab Process ------------------ @@ -103,7 +99,7 @@ An interactive map of OPNFV lab locations, lab owners and other lab information | 11 | Orange | https://wiki.opnfv.org/display/pharos/Opnfv-orange | Paris, France | | | | | | +----+---------------+----------------------------------------------------------------------------+-------------------+ -| 12 | ZTE | https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab | Nan Jing, China | +| 12 | ZTE | https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab | Shanghai, China | | | | | | +----+---------------+----------------------------------------------------------------------------+-------------------+ | 13 | Okinawa | https://wiki.opnfv.org/display/pharos/OOL+TestLab | Okinawa | @@ -117,6 +113,8 @@ Pharos project Key Facts **Key Project Facts are maintained in the Pharos INFO file in the project repo** - * Can be viewed on the project Wiki - `INFO <https://wiki.opnfv.org/pharos?&#pharos_project_-_key_facts>`_ - * Project key facts in repo: pharos/INFO + * Can be viewed on the project + `wiki INFO <https://wiki.opnfv.org/pharos?&#pharos_project_-_key_facts>`_ + * Project key facts in + `repo INFO <https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git;f=INFO;hb=refs/heads/master>`_ + diff --git a/docs/lab-description/templates.rst b/docs/lab-description/index.rst index 33cc5559..23b675ae 100644 --- a/docs/lab-description/templates.rst +++ b/docs/lab-description/index.rst @@ -11,16 +11,16 @@ Pharos Templates and Configuration Files Lab and POD templates are provided to help lab owners document capabilities, configurations and network topologies. Compute, network and storage specifications with network topology details are required to help developers use lab resources efficiently while minimizing support needs. This also -greatly assists with troubleshhoting. It is the responsibility of the lab owner to keep individual -lab documents updated and determine appropriate level of detail that is exposed publically through +greatly assists with troubleshoting. It is the responsibility of the lab owner to keep individual +lab documents updated and determine appropriate level of detail that is exposed publicly through the Wiki or maintained in a secure Pharos repo with controlled access. -While human readable configuration files are needed, the goal is for full automation of deployments. -This requires a common machine readable format for POD configurations as input to every installer. -This is the "POD inventory" common format file. +The goal of the Pharos Project is automation of resource provisioning. This requires machine +readable inventory and network configuration files that follow common format. .. toctree:: + :maxdepth: 2 ./lab_description.rst ./pod_description.rst diff --git a/docs/labs/index.rst b/docs/labs/index.rst new file mode 100755 index 00000000..d787e70b --- /dev/null +++ b/docs/labs/index.rst @@ -0,0 +1,19 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) 2016 OPNFV. + + +===================== +PHAROS Community Labs +===================== + + +.. toctree:: + :maxdepth: 2 + + ./Dell.rst + ./huawei-us-lab/huawei-us-lab.rst + ./ool/index.rst + ./orange-paris-lab/index.rst + ./spirent.rst + ./zte-sh-lab/index.rst diff --git a/docs/labs/ool/ool.rst b/docs/labs/ool/index.rst index 6be3f1be..6be3f1be 100644 --- a/docs/labs/ool/ool.rst +++ b/docs/labs/ool/index.rst diff --git a/docs/labs/orange-paris-lab/orange_paris.rst b/docs/labs/orange-paris-lab/index.rst index 113d5815..113d5815 100644 --- a/docs/labs/orange-paris-lab/orange_paris.rst +++ b/docs/labs/orange-paris-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/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-nj-lab/zte-nj.rst b/docs/labs/zte-nj-lab/zte-nj.rst deleted file mode 100644 index 94fb322f..00000000 --- a/docs/labs/zte-nj-lab/zte-nj.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-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/zte-sh.rst b/docs/labs/zte-sh-lab/index.rst index e48c21d4..f8ee36ed 100644 --- a/docs/labs/zte-sh-lab/zte-sh.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 |
