Merge "lf-pod4: Align with PDF spec, minor updates"

1 files changed, 66 insertions, 30 deletions

diff --git a/labs/lf/pod4.yaml b/labs/lf/pod4.yaml
index 04655ff..15d0736 100644
--- a/labs/lf/pod4.yaml
+++ b/labs/lf/pod4.yaml
@@ -16,7 +16,7 @@ net_config:
     vlan: 410
   admin:
     interface: 0
-    vlan: 0
+    vlan: native
     network: 10.20.0.0
     mask: 25
     gateway: 10.20.0.1
@@ -43,22 +43,22 @@ net_config:
     mask: 26
 ##############################################################################
 jumphost:
-  name: lfpod4-jumpserver
+  name: pod4-jump
   node: &nodeparams
     type: baremetal
-    vendor: Intel
-    model: E5-2699
+    vendor: Intel Corporation
+    model: S2600WT2R
     arch: x86_64
-    cpus: 4
+    cpus: 44
     cpu_cflags: haswell
-    cores: 22
+    cores: 44
     memory: 64G
   disks: &disks
     - name: 'disk1'
       disk_capacity: 480G
       disk_type: ssd
       disk_interface: sata
-      disk_rotation: ssd
+      disk_rotation:
   os: centos-7
   remote_params: &remote_params
     type: ipmi
@@ -71,16 +71,22 @@ jumphost:
     address: 172.30.8.83
     mac_address: "a4:bf:01:01:b0:bb"
   interfaces:
-    - "a4:bf:01:01:b0:b9"
-    - "00:1e:67:fd:9a:04"
-    - "00:1e:67:fd:9a:05"
+    - mac_address: "a4:bf:01:01:b0:b9"
+      speed: 1gb
+      features: 'dpdk|sriov'
+    - mac_address: "00:1e:67:fd:9a:04"
+      speed: 10gb
+      features: 'dpdk|sriov'
+    - mac_address: "00:1e:67:fd:9a:05"
+      speed: 10gb
+      features: 'dpdk|sriov'
   fixed_ips:
     admin: 10.20.0.2
     mgmt: 192.168.0.2
     public: 172.30.12.83
 ##############################################################################
 nodes:
-  - name: lfpod4-node1
+  - name: pod4-node1
     node: *nodeparams
     disks: *disks
     remote_management:
@@ -88,15 +94,21 @@ nodes:
       address: 172.30.8.84
       mac_address: "a4:bf:01:01:ab:b6"
     interfaces:
-      - "a4:bf:01:01:ab:b4"
-      - "00:1e:67:fd:9b:32"
-      - "00:1e:67:fd:9b:33"
+      - mac_address: "a4:bf:01:01:ab:b4"
+        speed: 1gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9b:32"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9b:33"
+        speed: 10gb
+        features: 'dpdk|sriov'
     fixed_ips:
       admin: 10.20.0.4
       mgmt: 192.168.0.4
       public: 172.30.12.84
   ############################################################################
-  - name: lfpod4-node2
+  - name: pod4-node2
     node: *nodeparams
     disks: *disks
     remote_management:
@@ -104,15 +116,21 @@ nodes:
       address: 172.30.8.85
       mac_address: "a4:bf:01:01:b6:97"
     interfaces:
-      - "a4:bf:01:01:b6:95"
-      - "00:1e:67:fd:98:e2"
-      - "00:1e:67:fd:98:e3"
+      - mac_address: "a4:bf:01:01:b6:95"
+        speed: 1gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:98:e2"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:98:e3"
+        speed: 10gb
+        features: 'dpdk|sriov'
     fixed_ips:
       admin: 10.20.0.5
       mgmt: 192.168.0.5
       public: 172.30.12.85
   ############################################################################
-  - name: lfpod4-node3
+  - name: pod4-node3
     node: *nodeparams
     disks: *disks
     remote_management:
@@ -120,15 +138,21 @@ nodes:
       address: 172.30.8.86
       mac_address: "a4:bf:01:01:66:fe"
     interfaces:
-      - "a4:bf:01:01:66:fc"
-      - "00:1e:67:fd:9c:c8"
-      - "00:1e:67:fd:9c:c9"
+      - mac_address: "a4:bf:01:01:66:fc"
+        speed: 1gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9c:c8"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9c:c9"
+        speed: 10gb
+        features: 'dpdk|sriov'
     fixed_ips:
       admin: 10.20.0.6
       mgmt: 192.168.0.6
       public: 172.30.12.86
   ############################################################################
-  - name: lfpod4-node4
+  - name: pod4-node4
     node: *nodeparams
     disks: *disks
     remote_management:
@@ -136,15 +160,21 @@ nodes:
       address: 172.30.8.87
       mac_address: "a4:bf:01:01:b2:f5"
     interfaces:
-      - "a4:bf:01:01:b2:f3"
-      - "00:1e:67:fd:9b:38"
-      - "00:1e:67:fd:9b:39"
+      - mac_address: "a4:bf:01:01:b2:f3"
+        speed: 1gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9b:38"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:9b:39"
+        speed: 10gb
+        features: 'dpdk|sriov'
     fixed_ips:
       admin: 10.20.0.7
       mgmt: 192.168.0.7
       public: 172.30.12.87
   ############################################################################
-  - name: lfpod4-node5
+  - name: pod4-node5
     node: *nodeparams
     disks: *disks
     remote_management:
@@ -152,9 +182,15 @@ nodes:
       address: 172.30.8.88
       mac_address: "a4:bf:01:01:b5:11"
     interfaces:
-      - "a4:bf:01:01:b5:0f"
-      - "00:1e:67:fd:99:40"
-      - "00:1e:67:fd:99:41"
+      - mac_address: "a4:bf:01:01:b5:0f"
+        speed: 1gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:99:40"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "00:1e:67:fd:99:41"
+        speed: 10gb
+        features: 'dpdk|sriov'
     fixed_ips:
       admin: 10.20.0.8
       mgmt: 192.168.0.8