Update IDF and PDF for zte pods
[securedlab.git] / labs / zte / pod3.yaml
index 08e12d5..fde8905 100644 (file)
@@ -1,5 +1,5 @@
 ---
-### ZTE POD e descriptor file ###
+### ZTE POD 3 descriptor file ###
 # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
 details:
@@ -9,7 +9,42 @@ details:
   location: Shanghai, China
   type: production
   link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
-
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.32-192.168.1.36
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.0.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 101
+    network: 192.168.11.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 102
+    network: 192.168.12.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1030
+    network: 192.168.13.0
+    mask: 24
+  public:
+    interface: 3
+    vlan: 103
+    network: 172.10.0.0
+    mask: 24
+    gateway: 172.10.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
 jumphost:
   name: pod3-jump
   node:
@@ -18,9 +53,9 @@ jumphost:
     model: R5300
     arch: x86_64
     cpus: 1
-    cpu_cflags: ivybridge
+    cpu_cflags: hasewell
     cores: 6
-    memory: 32G
+    memory: 80G
   disks:
     - name: 'disk1'
       disk_capacity: 300G
@@ -38,19 +73,22 @@ jumphost:
       disk_interface: iscsi
       disk_rotation: 10000
   os: CentOS-7
-  remote_params: &remoteparas
+  remote_params: &remote_params
     type: ipmi
     versions:
       - 2.0
     user: zteroot
     pass: superuser
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
   interfaces:
-    - nic: 'nic1'
-      mac_address: "74:4a:a4:00:21:0c"
-      address:
-        - 10.20.0.1
-        - 172.10.0.240
-        - 192.168.1.4
+    - mac_address: "74:4a:a4:00:21:0c"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.0.1
+    public: 172.10.0.240
 nodes:
   - name: pod3-node1
     node: &nodeparas
@@ -74,144 +112,99 @@ nodes:
         disk_interface: sas
         disk_rotation: 10000
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.32
       mac_address: "0c:12:62:e4:bf:de"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:0b:85"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:85"
-        address: 10.20.0.11/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:0b:86"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:86"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:0b:87"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:87"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:0b:88"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:0b:88"
-        vlan: 103, 1020
   - name: pod3-node2
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.33
       mac_address: "00:12:62:e4:c0:33"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:5d"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5d"
-        address: 10.20.0.12/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:5e"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5e"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:5f"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:5f"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:60"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:60"
-        vlan: 103, 1020
   - name: pod3-node3
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.34
       mac_address: "74:4a:a4:00:30:93"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:35"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:35"
-        address: 10.20.0.13/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:36"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:36"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:37"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:37"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:38"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:38"
-        vlan: 103, 1020
   - name: pod3-node4
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.35
       mac_address: "00:12:62:e4:c0:42"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:69"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:69"
-        address: 10.20.0.14/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:6a"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6a"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:6b"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6b"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:6c"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6c"
-        vlan: 103, 1020
   - name: pod3-node5
     node: *nodeparas
     disks: *disks
     remote_management:
-      <<: *remoteparas
+      <<: *remote_params
       address: 192.168.1.36
       mac_address: "74:4a:a4:00:30:43"
     interfaces:
-      - name: 'nic1'
+      - mac_address: "74:4a:a4:00:5c:6d"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6d"
-        address: 10.20.0.15/24
-        vlan: 100
-      - name: 'nic2'
+      - mac_address: "74:4a:a4:00:5c:6e"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6e"
-        vlan: 101
-      - name: 'nic3'
+      - mac_address: "74:4a:a4:00:5c:6f"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:6f"
-        vlan: 102
-      - name: 'nic4'
+      - mac_address: "74:4a:a4:00:5c:70"
         speed: 10gb
         features: dpdk|sriov
-        mac_address: "74:4a:a4:00:5c:70"
-        vlan: 103, 1020