Due to migration, update zte-pod1 and zte-pod2 info.

JIRA: PHAROS-245

Change-Id: I3f8b20d3fea0bf00a210459b950186219c3c43f0
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod1_description.rst
index 2766630..7ec53a8 100644 (file)
--- 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 5ceb0db..3414bc1 100644 (file)
--- 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 1931ba5..961aa2a 100644 (file)
--- 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 c060a78..a49ac19 100644 (file)
--- 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
-