summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/labs/ericsson/images/ericsson-opnfv-topology.pngbin0 -> 1011133 bytes
-rw-r--r--docs/labs/ericsson/index.rst15
-rw-r--r--docs/labs/ericsson/lab_description.rst148
-rw-r--r--docs/labs/images/orange_pod2.pngbin0 -> 83662 bytes
-rwxr-xr-xdocs/labs/index.rst1
-rw-r--r--docs/labs/orange-lannion-lab/index.rst215
-rw-r--r--docs/labs/zte-sh-lab/lab_description.rst4
-rw-r--r--docs/labs/zte-sh-lab/pod1_description.rst135
-rw-r--r--docs/labs/zte-sh-lab/pod1_inventory.yaml23
-rw-r--r--docs/labs/zte-sh-lab/pod2_description.rst126
-rw-r--r--docs/labs/zte-sh-lab/pod2_inventory.yaml23
11 files changed, 557 insertions, 133 deletions
diff --git a/docs/labs/ericsson/images/ericsson-opnfv-topology.png b/docs/labs/ericsson/images/ericsson-opnfv-topology.png
new file mode 100644
index 00000000..b3c86d3e
--- /dev/null
+++ b/docs/labs/ericsson/images/ericsson-opnfv-topology.png
Binary files differ
diff --git a/docs/labs/ericsson/index.rst b/docs/labs/ericsson/index.rst
new file mode 100644
index 00000000..f7058eca
--- /dev/null
+++ b/docs/labs/ericsson/index.rst
@@ -0,0 +1,15 @@
+.. 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
+
+**************************************
+ERICSSON OPNFV Lab Configuration Files
+**************************************
+
+
+.. toctree::
+ :maxdepth: 2
+
+ ./lab_description.rst
diff --git a/docs/labs/ericsson/lab_description.rst b/docs/labs/ericsson/lab_description.rst
new file mode 100644
index 00000000..b4c5b856
--- /dev/null
+++ b/docs/labs/ericsson/lab_description.rst
@@ -0,0 +1,148 @@
+.. 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:
+
+*********************************
+Ericssion OPNFV Lab Specification
+*********************************
+
+
+Introduction
+------------
+
+Ericsson OPNFV Lab currently has 2 Bare Metal and 3 Virtual PODs available globally (hosted in
+the GIC). Each POD has 5 servers, comprised of 3 controller nodes (HA) and 2 computes nodes. NOTE:
+(this make differ depending on scenario).
+
+.. _pharos_pod:
+
+These PODs are dedicated for use by Production/CI. These PODs focus on providing verification,
+build, deploy and testing for scenarios related with **test** projects, **installer** projects and
+perforamnce enhancement projects, such as KVM, OVS, FDS, etc.
+
+In addition to the full-time CI/CD resources, the Ericsson OPNFV lab provides developer labs (DRs)
+for project usage, testing and development.
+
+Scenarios services by this lab are:
+
+Scenario defitions can be found here:
+`Colorado Scenario Status <https://wiki.opnfv.org/display/SWREL/Colorado+Scenario+Status>`_
+
+Lab Resources
+-------------
+
+- `Ericsson Hostting And Request Page <https://wiki.opnfv.org/display/pharos/Ericsson+Hosting+and+Request+Process>`_
+
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| POD Name | Project(s) | PTL(s) | Email(s) | POD Role | Status | Notes |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| POD1 | CI/CD | Daniel | daniel.smith@ericsson.com | CI: latest | Active | BM-CI |
+| | | Smith | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| POD2 | CI/CD | Daniel | daniel.smith@ericsson.com | CI: latest | Active | BM-CI |
+| | | Smith | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| vPOD1 | CI/CD | Fatih | fatih.degirmenci@ericsson.com | CI: latest | Active | Virt-CI |
+| | | Degirmenci | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-166 | FUEL | Constant | constant.wette@ericsson.com | DR: B-rel | Active | Nested |
+| | | Wette | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-167 | OVSNFV | Billy | billy.omahoney@intel.com | DR: C-rel | Active | Hybrid |
+| | | O'Mahoney | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-174 | GLUON | Bin | bh526r@att.com | DR: D-rel | Active | Nested* |
+| | | Hu | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-180 | SAVI | Rick | richard.brunner@ericsson.com | DR: D-rel | Active | Nested* |
+| | | Brunner | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-181 | IPV6-MULTI | Bin | bh526r@att.com | DR: D-rel | Active | Nested* |
+| | | Hu | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-191 | AUTO-DEP | Peter | Peter.Barabas@ericsson.com | DR: C-rel | Active | Nested* |
+| | | Barabas | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-199 | SDN-L3 | Tim | Tim.Irnich@ericsson.com | DR: C-rel | Active | Nested* |
+| | | Irnich | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-236 | LLT-TOOL | Jose | Jose.Lausuch@ericsson.com | DR: C-rel | Active | Nested* |
+| | | Lausuch | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+| PHAROS-253 | ODL-II | Nikolas | Nikolas.Hermanns@ericsson.com | DR: C-rel | Active | Nested* |
+| | | Hermanns | | | | |
++------------+------------+------------+-------------------------------+------------+--------+---------+
+
+
+- `ACTIVE CI/CD LAB SPECS <https://wiki.opnfv.org/pages/viewpage.action?pageId=6829012>`_
+* `CI-ERICSSON-POD1 wiki page <https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1>`_
+* `CI-ERICSSON-POD1 wiki page <https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD2>`_
+- `ACTIVE LAB SPECS <https://wiki.opnfv.org/display/pharos/Active+Lab+Specs>`_
+* `PHAROS-166 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-166%3A+++++++PaaS+PoC>`_
+* `PHAROS-167 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-167%3A+OVS-NFV+BareMetal+Lab>`_
+* `PHAROS-174 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-174%3A+Gluon+PoC+for+OPNFV+Summit>`_
+* `PHAROS-180 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-180%3A+++++++SAVI+CDN+POC>`_
+* `PHAROS-181 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-181%3A+IPV6+Multisite>`_
+* `PHAROS-191 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-191%3A+++++++Colorado+-+Autodeployer+Uplift>`_
+* `PHAROS-199 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-199%3A+++++++ODL-L3+troubleshooting>`_
+* `PHAROS-236 wiki page <https://wiki.opnfv.org/display/pharos/PHAROS-236%3A+Tracing+Tool+-+LLTng>`_
+* `PHAROS-253 wiki page <https://wiki.opnfv.org/pages/viewpage.action?pageId=6828594>`_
+- `Decommissioned Requets <https://wiki.opnfv.org/display/pharos/Decommissioned+Lab+Request>`_
+
+
+Acceptable Usage Policy
+-----------------------
+
+Resources located in Ericsson OPNFV lab shall only be used for CI, infra setup/configuration and
+troubleshooting purposes. No development work is allowed in these PODs. Development Work should
+only be performed on the DR labs assigned to individual projects.
+
+
+Remote Access Infrastructure
+----------------------------
+
+Ericsson OPNFV lab provides a SSH GW that allows for unlimited port-forwarding, as well as Remote
+Desktop, VNC and SOCKS proxy capability allowing the end user to feel as though directly connected
+to the lab.
+
+Remote Access Procedure
+-----------------------
+
+Access to this environment can be granted by sending an e-mail to: **daniel.smith@ericsson.com**.
+
+Subject: ericsson opnfv access.
+
+The following information should be provided in the request:
+
+::
+
+ Full name:
+ E-mail:
+ Organization:
+ Why is access needed:
+ How long is access needed:
+ Number of Hosts required:
+ Topology Required (HA, SA):
+ Feature/Plugins/Options Required (DPDK, ODL, ONOS):
+
+Enclosed a copy of your id_rsa.pub (public key) with your request and a login will be created for you
+
+
+Lab Documentation
+-----------------
+
+
+Lab Topology
+------------
+
+.. image:: ./images/ericsson_opnfv_topology.png
+ :alt: Lab diagram not found
+
+Each POD is an individual entity with its own set of independant networks allowing for
+interconnection between DR labs, intra connectinos within multiple Nested DRs all without touching
+the CI/CD running in production.
+
+Refer to each Lab specific wiki page for IP and Login and Topology Information.
+
diff --git a/docs/labs/images/orange_pod2.png b/docs/labs/images/orange_pod2.png
new file mode 100644
index 00000000..05693281
--- /dev/null
+++ b/docs/labs/images/orange_pod2.png
Binary files differ
diff --git a/docs/labs/index.rst b/docs/labs/index.rst
index d787e70b..db07640b 100755
--- a/docs/labs/index.rst
+++ b/docs/labs/index.rst
@@ -12,6 +12,7 @@ PHAROS Community Labs
:maxdepth: 2
./Dell.rst
+ ./ericsson/index.rst
./huawei-us-lab/huawei-us-lab.rst
./ool/index.rst
./orange-paris-lab/index.rst
diff --git a/docs/labs/orange-lannion-lab/index.rst b/docs/labs/orange-lannion-lab/index.rst
new file mode 100644
index 00000000..48235759
--- /dev/null
+++ b/docs/labs/orange-lannion-lab/index.rst
@@ -0,0 +1,215 @@
+Orange OPNFV Testlab
+==================================================
+
+Overview
+------------------
+
+Orange Labs is hosting an OPNFV testlab at its Lannion facility. The testlab would host baremetal
+servers for the use of OPNFV community as part of the OPNFV Pharos Project
+
+
+The Orange Testlab consists of PODs
+ * POD2 for Joid
+
+POD2 consists of 8 servers
+ * 1 Jump Server
+ * 4 Servers for Control Nodes
+ * 3 Servers for Compute Nodes
+
+
+
+Hardware details
+-----------------
+
+All the servers within the two PODs reside within a two chassis and have the
+following specifications:
+
+POD2-Joid
+^^^^^^^^^^^^
+
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Hostname| Model |Memory |Storage | Processor 1 |Cores|Threads| Processor 2 |Cores|Threads|
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node1 |ProLiant DL380 Gen9 |128 GB |2xIntel SSD S3500 480GB+1 SAS 300GB|Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 | Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node2 |ProLiant DL380 Gen9 |128 GB |2xIntel SSD S3500 480GB+ SAS 300GB|Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 | Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node3 |ProLiant DL380 Gen9 |128 GB |2xIntel SSD S3500 480GB+1 SAS 300GB|Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 | Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz | 18 | 36 |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node4 |ProLiant DL380 Gen9 |128 GB |2xIntel SSD S3500 480GB+1 SAS 300GB|Intel(R) Xeon(R) CPU E5-2609 v3 @ 1.90GHz | 6 | 6 | Intel(R) Xeon(R) CPU E5-2609 v3 @ 1.90GHz | 6 | 6 |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node5 |ProLiant DL360 Gen9 |32 GB |2xSAS 300GB |Intel(R) Xeon(R) CPU E5-2683 v3 @ 2.00GHz | 14 | 28 | N/A | | |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node6 |ProLiant DL360 Gen9 |32 GB |2xSAS 300GB |Intel(R) Xeon(R) CPU E5-2683 v3 @ 2.00GHz | 14 | 28 | N/A | | |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+| Node7 |ProLiant DL360 Gen9 |32 GB |2xSAS 300GB |Intel(R) Xeon(R) CPU E5-2683 v3 @ 2.00GHz | 14 | 28 | N/A | | |
++---------+--------------------+-------+-----------------------------------+------------------------------------------+-----+-------+-------------------------------------------+-----+-------+
+
+Software
+---------
+
+The Jump servers in the Testlab are pre-provisioned with the following softwares:
+
+ * Joid-Jump Server:
+
+ 1. OS: Ubuntu 14.04
+
+
+
+Networks
+----------
+
+POD2-Joid
+^^^^^^^^^^^^
+
+.. image:: images/Orange_POD2.jpg
+ :height: 721
+ :width: 785
+ :alt: POD2-Joid Overview
+ :align: left
+
+
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Hostname | NIC Model | Ports | MAC | BW | Roles |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node1 | 1, Broadcom NetXtreme BCM5719 | eth0 | 38:63:bb:3f:bc:c8 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 38:63:bb:3f:bc:c9 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 2, Broadcom NetXtreme BCM5719 | eth2 | 38:63:bb:3f:bc:ca | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 38:63:bb:3f:bc:cb | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 3, Intel X540-AT2 DPDK | eth4 | a0:36:9f:4e:88:5c | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth5 | a0:36:9f:4e:88:5e | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node2 | 1, Broadcom NetXtreme BCM5719 | eth0 | 38:63:bb:44:34:84 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 38:63:bb:44:34:85 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 2, Broadcom NetXtreme BCM5719 | eth2 | 38:63:bb:44:34:86 | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 38:63:bb:44:34:87 | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 3, Intel X540-AT2 DPDK | eth4 | a0:36:9f:4e:8b:0c | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth5 | a0:36:9f:4e:8b:0e | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node3 | 1, Broadcom NetXtreme BCM5719 | eth0 | 38:63:bb:3f:1d:8c | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 38:63:bb:3f:1d:8d | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 1, Broadcom NetXtreme BCM5719 | eth2 | 38:63:bb:3f:1d:8e | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 38:63:bb:3f:1d:8f | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 3, Intel X540-AT2 DPDK | eth4 | a0:36:9f:4e:88:38 | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth5 | a0:36:9f:4e:88:3a | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node4 | 1, Broadcom NetXtreme BCM5719 | eth0 | 38:63:bb:3f:2d:a8 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 38:63:bb:3f:2d:a9 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 1, Broadcom NetXtreme BCM5719 | eth2 | 38:63:bb:3f:2d:aa | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 38:63:bb:3f:2d:ab | 10G | N/A |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 3, Intel X540-AT2 DPDK | eth4 | a0:36:9f:4e:8b:18 | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth5 | a0:36:9f:4e:8b:1a | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node5 | 1, Broadcom NetXtreme BCM5719 | eth0 | 94:57:a5:52:c9:48 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 94:57:a5:52:c9:49 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 1, Broadcom NetXtreme BCM5719 | eth2 | 94:57:a5:52:c9:4a | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 94:57:a5:52:c9:4b | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node6 | 1, Broadcom NetXtreme BCM5719 | eth0 | 94:57:a5:52:63:b0 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 94:57:a5:52:63:b1 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 1, Broadcom NetXtreme BCM5719 | eth2 | 94:57:a5:52:63:b2 | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 94:57:a5:52:63:b3 | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| Node7 | 1, Broadcom NetXtreme BCM5719 | eth0 | 94:57:a5:52:f1:80 | 10G | Admin |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth1 | 94:57:a5:52:f1:81 | 10G | Public|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | 1, Broadcom NetXtreme BCM5719 | eth2 | 94:57:a5:52:f1:82 | 10G | Storage|
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+| | | eth3 | 94:57:a5:52:f1:83 | 10G | VM |
++--------------+--------------------------------------+-------+-------------------+-----+--------+
+
+
+
+
+
+
+Subnet allocations Pod2
+^^^^^^^^^^^^^^^^^^^^^^^^
+
++-----------+--------------+------------------+--------------+----------+
+| Network | Address | Mask | Gateway | VLAN id |
++-----------+--------------+------------------+--------------+----------+
+|Admin | 192.168.2.0 | 255.255.255.0 | 192.168.2.1 | 200 |
++-----------+--------------+------------------+--------------+----------+
+|Public | 161.105.231.0| 255.255.255.192 | 161.105.231.1| 135 |
++-----------+--------------+------------------+--------------+----------+
+|Storage | 192.168.12.0 | 255.255.255.0 | 192.168.2.1 | 210 |
++-----------+--------------+------------------+--------------+----------+
+|VM | 192.168.22.0 | 255.255.255.0 | 192.168.22.1 | 230 |
++-----------+--------------+------------------+--------------+----------+
+
+
+ILO Pod2
+^^^^^^^^
+
+**POD2**
+
++-----------+--------------------+-------------------+-------------+-------------+
+| Hostname | Lights-out address | MAC | Username | Password |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node1 | 192.168.2.11 | 38:63:bb:39:b2:2e |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node2 | 192.168.2.12 | 14:58:d0:48:7b:7a |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node3 | 192.168.2.13 | 38:63:bb:39:b2:86 |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node4 | 192.168.2.14 | 38:63:bb:39:b2:40 |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node5 | 192.168.2.15 | 94:57:a5:62:73:c2 |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node6 | 192.168.2.16 | 94:57:a5:62:72:90 |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+| Node7 | 192.168.2.17 | 94:57:a5:62:f4:c6 |Administrator| pod2Admin |
++-----------+--------------------+-------------------+-------------+-------------+
+
+
+Remote access infrastructure
+-----------------------------
+
+The Orange OPNFV testlab is free to use for the OPNFV community.
+
+To access the Testlab, please contact bertrand.lelamer AT orange.com with
+the following details:
+ * Name
+ * Email
+ * Designation
+ * Organization
+ * Purpose of using the lab
+ * SSH public key
+
+
+
+*Accessing the Orange Lannion Testlab*
+--------------------------------------
+
+POD2 JumpServer
+^^^^^^^^^^^^^^^
+
+
diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst
index f6224855..47caed45 100644
--- a/docs/labs/zte-sh-lab/lab_description.rst
+++ b/docs/labs/zte-sh-lab/lab_description.rst
@@ -13,7 +13,7 @@ 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 dedicatedly used for Production/CI. These PODs
+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.
@@ -79,7 +79,7 @@ The following information should be provided in the request:
Organization:
Why is access needed:
How long is access needed:
- What sepcific Host will be accessed:
+ 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.
diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod1_description.rst
index 27666308..7ec53a82 100644
--- a/docs/labs/zte-sh-lab/pod1_description.rst
+++ b/docs/labs/zte-sh-lab/pod1_description.rst
@@ -48,64 +48,89 @@ POD1 share the same **Jump Host** in the lab.
**Nodes/Servers**
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| | | | | | Memory | Local | Lights-out network | 1GbE: NIC#/IP | 10GbE: NIC#/IP | |
-| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node1 | ZTE | E9000 | 281498500141 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.101 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 4c:09:b4:b2:59:84 | 4c:09:b4:b2:59:87 | 4c:09:b4:b1:de:38 | |
-| | | | | | | | zteroot/superuser | vlan 1/PXE | vlan 1/ public | |
-| | | | | | | | | vlan 101/management | vlan 103/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 4c:09:b4:b1:de:3a | |
-| | | | | | | | | | vlan 102/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node2 | ZTE | E9000 | 281498500179 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.22 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 4c:09:b4:b2:59:f9 | 4c:09:b4:b2:59:fc | 4c:09:b4:b1:de:40 | |
-| | | | | | | | zteroot/superuser | vlan 1/PXE | vlan 1/ public | |
-| | | | | | | | | vlan 101/management | vlan 103/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 4c:09:b4:b1:de:42 | |
-| | | | | | | | | | vlan 102/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node3 | ZTE | E9000 | 281498500008 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.3 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 4c:09:b4:b2:59:9f | 4c:09:b4:b2:59:a2 | 4c:09:b4:b1:de:1c | |
-| | | | | | | | zteroot/superuser | vlan 1/PXE | vlan 1/ public | |
-| | | | | | | | | vlan 101/management | vlan 103/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 4c:09:b4:b1:de:1e | |
-| | | | | | | | | | vlan 102/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node4 | ZTE | E9000 | 281498500157 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.4 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 4c:09:b4:b2:59:d5 | 4c:09:b4:b2:59:d8 | 4c:09:b4:b1:de:18 | |
-| | | | | | | | zteroot/superuser | vlan 1/PXE | vlan 1/ public | |
-| | | | | | | | | vlan 101/management | vlan 103/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 4c:09:b4:b1:de:1a | |
-| | | | | | | | | | vlan 102/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node5 | ZTE | E9000 | 281498500119 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.5 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 4c:09:b4:b2:59:72 | 4c:09:b4:b2:59:75 | 4c:09:b4:b1:de:48 | |
-| | | | | | | | zteroot/superuser | vlan 1/PXE | vlan 1/ public | |
-| | | | | | | | | vlan 101/management | vlan 103/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 4c:09:b4:b1:de:4a | |
-| | | | | | | | | | vlan 102/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
++----------+--------+-------+---------------+-----------+--------+-------------+---------------------+---------------------+----------------------+-------+
+| | | | | | 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.10.0.0 | 255.255.255.0 | 172.10.0.1 | untagged |
-+----------------+--------------+----------------+------------+---------------+
-| Fuel Admin/PXE | 10.20.0.0 | 255.255.255.0 | 10.20.0.2 | native vlan 1 |
-+----------------+--------------+----------------+------------+---------------+
-| Fuel Mangement | 192.168.10.0 | 255.255.255.0 | | 101 |
-+----------------+--------------+----------------+------------+---------------+
-| Fuel Storage | 192.168.11.0 | 255.255.255.0 | | 102 |
-+----------------+--------------+----------------+------------+---------------+
++----------------+--------------+----------------+------------+-----------------+
+| 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
diff --git a/docs/labs/zte-sh-lab/pod1_inventory.yaml b/docs/labs/zte-sh-lab/pod1_inventory.yaml
index 5ceb0dbd..3414bc12 100644
--- a/docs/labs/zte-sh-lab/pod1_inventory.yaml
+++ b/docs/labs/zte-sh-lab/pod1_inventory.yaml
@@ -2,48 +2,45 @@ nodes:
- name: node1
tags: control #optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "4c:09:b4:b2:59:87" #pxe boot interface mac
+ mac_address: "74:4A:A4:00:CF:DC" #pxe boot interface mac
power:
type: ipmi
- address: 129.5.1.101
+ address: 192.168.1.101
user: zteroot
pass: superuser
- name: node2
tags: control
arch: "x86_64"
- mac_address: "4c:09:b4:b2:59:fc"
+ mac_address: "74:4A:A4:00:CE:CE"
power:
type: ipmi
- address: 129.5.1.22
+ address: 192.168.1.102
user: zteroot
pass: superuser
- name: node3
tags: control
arch: "x86_64"
- mac_address: "4c:09:b4:b2:59:a2"
+ mac_address: "74:4A:A4:00:CF:58"
power:
type: ipmi
- address: 129.5.1.3
+ address: 192.168.1.103
user: zteroot
pass: superuser
-
- name: node4
tags: compute
arch: "x86_64"
- mac_address: "4c:09:b4:b2:59:d8"
+ mac_address: "74:4A:A4:00:49:84"
power:
type: ipmi
- address: 129.5.1.4
+ address: 192.168.1.104
user: zteroot
pass: superuser
-
- name: node5
tags: compute
arch: "x86_64"
- mac_address: "4c:09:b4:b2:59:75"
+ mac_address: "74:4A:A4:00:CE:C2"
power:
type: ipmi
- address: 129.5.1.5
+ 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
index 1931ba56..961aa2a0 100644
--- a/docs/labs/zte-sh-lab/pod2_description.rst
+++ b/docs/labs/zte-sh-lab/pod2_description.rst
@@ -47,65 +47,91 @@ POD2 share the same **Deploy Server** with POD1.
+-----------+--------+-------+---------------+-----------+--------+-----------+--------------------+------------------+-------+
-**Compute Nodes**
-
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| | | | | | Memory | Local | Lights-out network | 1GbE: NIC#/IP | 10GbE: NIC#/IP | |
-| Hostname | Vendor | Model | Serial Number | CPUs | (GB) | Storage | (IPMI): IP/MAC, U/P | MAC/VLAN/Network | MAC/VLAN/Network | Notes |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node1 | ZTE | E9000 | 281498500141 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.9 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 3c:da:2a:e8:01:ea | 3c:da:2a:e8:01:ed | 3c:da:2a:e9:02:dc | |
-| | | | | | | | zteroot/superuser | vlan 500/PXE | vlan 500/ public | |
-| | | | | | | | | vlan 501/management | vlan 503/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 3c:da:2a:e9:02:de | |
-| | | | | | | | | | vlan 502/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node2 | ZTE | E9000 | 281498500179 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.10 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 3c:da:2a:e8:02:49 | 3c:da:2a:e8:02:4c | 3c:da:2a:e9:02:d0 | |
-| | | | | | | | zteroot/superuser | vlan 500/PXE | vlan 500/ public | |
-| | | | | | | | | vlan 501/management | vlan 503/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 3c:da:2a:e9:02:d2 | |
-| | | | | | | | | | vlan 502/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node3 | ZTE | E9000 | 281498500008 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.11 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 3c:da:2a:e8:01:a4 | 3c:da:2a:e8:01:a7 | 3c:da:2a:e9:02:ec | |
-| | | | | | | | zteroot/superuser | vlan 500/PXE | vlan 500/ public | |
-| | | | | | | | | vlan 501/management | vlan 503/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 3c:da:2a:e9:02:ee | |
-| | | | | | | | | | vlan 502/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node4 | ZTE | E9000 | 281498500157 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.12 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 3c:da:2a:e8:01:c7 | 3c:da:2a:e8:01:ca | 3c:da:2a:e9:02:d4 | |
-| | | | | | | | zteroot/superuser | vlan 500/PXE | vlan 500/ public | |
-| | | | | | | | | vlan 501/management | vlan 503/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 3c:da:2a:e9:02:d6 | |
-| | | | | | | | | | vlan 502/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
-| node5 | ZTE | E9000 | 281498500119 | E5-2680x2 | 128 | 600GB HDD | 129.5.1.13 | enp129s0f0: | enp2s0f0: | |
-| | | | | | | | 3c:da:2a:e8:01:b3 | 3c:da:2a:e8:01:b6 | 3c:da:2a:e9:02:ac | |
-| | | | | | | | zteroot/superuser | vlan 500/PXE | vlan 500/ public | |
-| | | | | | | | | vlan 501/management | vlan 503/ private | |
-| | | | | | | | | | enp132s0f0: | |
-| | | | | | | | | | 3c:da:2a:e9:02:ae | |
-| | | | | | | | | | vlan 502/ storage | |
-+----------+--------+-------+---------------+-----------+--------+-----------+---------------------+---------------------+-------------------+-------+
+**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.30.0.0 | 255.255.255.0 | 172.30.0.1 | Untagged |
+| Public | 172.70.0.0 | 255.255.255.0 | 172.70.0.1 | 173 |
+----------------+--------------+----------------+------------+-----------------+
-| Fuel Admin | 10.20.1.0 | 255.255.255.0 | 10.20.1.1 | native vlan 500 |
+| Fuel Admin | 10.20.7.0 | 255.255.255.0 | 10.20.7.1 | native vlan 170 |
+----------------+--------------+----------------+------------+-----------------+
-| Fuel Mangement | 192.168.30.0 | 255.255.255.0 | | 501 |
+| Fuel Mangement | 192.168.71.0 | 255.255.255.0 | | 171 |
+----------------+--------------+----------------+------------+-----------------+
-| Fuel Storage | 192.168.31.0 | 255.255.255.0 | | 502 |
+| Fuel Storage | 192.168.72.0 | 255.255.255.0 | | 172 |
+----------------+--------------+----------------+------------+-----------------+
diff --git a/docs/labs/zte-sh-lab/pod2_inventory.yaml b/docs/labs/zte-sh-lab/pod2_inventory.yaml
index c060a78f..a49ac190 100644
--- a/docs/labs/zte-sh-lab/pod2_inventory.yaml
+++ b/docs/labs/zte-sh-lab/pod2_inventory.yaml
@@ -2,48 +2,45 @@ nodes:
- name: node1
tags: control #optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "3c:da:2a:e8:01:ed" #pxe boot interface mac
+ mac_address: "74:4A:A4:00:CD:72" #pxe boot interface mac
power:
type: ipmi
- address: 129.5.1.9
+ address: 192.168.1.106
user: zteroot
pass: superuser
- name: node2
tags: control
arch: "x86_64"
- mac_address: "3c:da:2a:e8:02:4c"
+ mac_address: "74:4A:A4:00:CA:CC"
power:
type: ipmi
- address: 129.5.1.10
+ address: 192.168.1.107
user: zteroot
pass: superuser
- name: node3
tags: control
arch: "x86_64"
- mac_address: "3c:da:2a:e8:01:a7"
+ mac_address: "74:4A:A4:00:CD:12"
power:
type: ipmi
- address: 129.5.1.11
+ address: 192.168.1.108
user: zteroot
pass: superuser
-
- name: node4
tags: compute
arch: "x86_64"
- mac_address: "3c:da:2a:e8:01:ca"
+ mac_address: "74:4A:A4:00:CF:40"
power:
type: ipmi
- address: 129.5.1.12
+ address: 192.168.1.109
user: zteroot
pass: superuser
-
- name: node5
tags: compute
arch: "x86_64"
- mac_address: "3c:da:2a:e8:01:b6"
+ mac_address: "74:4A:A4:00:CE:D4"
power:
type: ipmi
- address: 129.5.1.13
+ address: 192.168.1.110
user: zteroot
pass: superuser
-