From 917a71636a73cc72098d13ec32e52520cced8237 Mon Sep 17 00:00:00 2001
From: Cristina Pauna <cristina.pauna@enea.com>
Date: Fri, 1 Feb 2019 16:41:19 +0200
Subject: [fuel] Update computes on pod10

The compute nodes on pod10 have been replaced, therefore the pdf/idf
data needs to be updated

Change-Id: Ib355a3e46d13a6934e2694af7888103519c30419
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
---
 labs/arm/idf-pod10.yaml | 20 +++++---------
 labs/arm/pod10.yaml     | 69 ++++++++++++++++++++++++++++---------------------
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml
index 5edca466..1c856d93 100644
--- a/labs/arm/idf-pod10.yaml
+++ b/labs/arm/idf-pod10.yaml
@@ -85,30 +85,22 @@ idf:
           busaddr: *busaddr_intel
         - interfaces: *interfaces_intel
           busaddr: *busaddr_intel
-        - interfaces:
-            - 'enP5s3'
-            - 'enP2p1s0f2'
-            - 'enP2p1s0f3'
-            - 'enP2p1s0f1'
-          busaddr:
-            - '0005:90:00.0'
-            - '0002:01:00.2'
-            - '0002:01:00.3'
-            - '0002:01:00.1'
-        - interfaces:
+        - interfaces: &interfaces_arm
             - 'enP5p144s0'
-            - 'enP2p1s0f2'
             - 'enP2p1s0f1'
+            - 'enP2p1s0f2'
             - 'enP2p1s0f3'
             - 'enP2p1s0f4'
             - 'enP2p1s0f5'
-          busaddr:
+          busaddr: &busaddr_arm
             - '0005:90:00.0'
-            - '0002:01:00.2'
             - '0002:01:00.1'
+            - '0002:01:00.2'
             - '0002:01:00.3'
             - '0002:01:00.4'
             - '0002:01:00.5'
+        - interfaces: *interfaces_arm
+          busaddr: *busaddr_arm
     reclass:
       node:
         - compute_params: &compute_params_intel
diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml
index 1926da9a..0199c584 100644
--- a/labs/arm/pod10.yaml
+++ b/labs/arm/pod10.yaml
@@ -208,7 +208,7 @@ nodes:
         features: ''
         name: 'nic6'
   ############################################################################
-  - name: cn8890-10
+  - name: cn8890-14
     node:
       type: baremetal
       vendor: Cavium
@@ -220,41 +220,52 @@ nodes:
       memory: 128G
     disks:
       - name: 'disk1'
-        disk_capacity: 500G
-        disk_type: hdd
+        disk_capacity: 240G
+        disk_type: ssd
         disk_interface: sata
-        disk_rotation: 7200
+        disk_rotation: 0
     remote_management:
       type: ipmi
       versions:
         - 2.0
-      user: admin
-      pass: admin
+      user: ADMIN
+      pass: ADMIN
       address: 10.0.21.5
-      mac_address: "40:8D:5C:BA:B9:65"
+      mac_address: "1c:1b:0d:60:ed:9b"
     interfaces:
-      # enP5s3, Connected, used only for admin/PXE
-      - mac_address: "68:05:ca:3d:93:0f"
+      # enP5144s0, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:42:cb:e5"
         speed: 1gb
         features: ''
         name: 'nic1'
-      # enP2p1s0f2, Connected, trunk for all other VLANs
-      - mac_address: "00:0f:b7:07:00:c1"
+      # enP2p1s0f1, Connected, trunk for all other VLANs
+      - mac_address: "1c:1b:0d:60:ed:96"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic2'
-      # enP2p1s0f3, private
-      - mac_address: "00:0f:b7:07:00:c2"
+      # enP2p1s0f2, private
+      - mac_address: "1c:1b:0d:60:ed:97"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic3'
-      # enP2p1s0f1, Not connected
-      - mac_address: "00:0f:b7:07:00:c0"
+      # enP2p1s0f3, Not connected
+      - mac_address: "1c:1b:0d:60:ed:98"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      # enP2p1s0f4, Not connected
+      - mac_address: "1c:1b:0d:60:ed:99"
+        speed: 10gb
+        features: 'dpdk|sriov'
+        name: 'nic4'
+      # enP2p1s0f5, Not connected
+      - mac_address: "1c:1b:0d:60:ed:9a"
         speed: 40gb
         features: 'dpdk|sriov'
         name: 'nic4'
+
   ############################################################################
-  - name: cn8890-23
+  - name: cn8890-15
     node:
       type: baremetal
       vendor: Cavium
@@ -266,7 +277,7 @@ nodes:
       memory: 64G
     disks:
       - name: 'disk1'
-        disk_capacity: 480G
+        disk_capacity: 240G
         disk_type: ssd
         disk_interface: sata
         disk_rotation: 0
@@ -277,35 +288,35 @@ nodes:
       user: ADMIN
       pass: ADMIN
       address: 10.0.21.6
-      mac_address: "1c:1b:0d:e8:fb:b7"
+      mac_address: "1c:1b:0d:60:ed:b7"
     interfaces:
       # enP5p144s0
-      - mac_address: "68:05:ca:5a:c3:b9"
+      - mac_address: "68:05:ca:42:cb:e8"
         speed: 1gb
         features: ''
         name: 'nic1'
-      # enP2p1s0f2
-      - mac_address: "1c:1b:0d:e8:fb:b0"
+      # enP2p1s0f1
+      - mac_address: "1c:1b:0d:60:ed:b2"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic2'
-      # enP2p1s0f1
-      - mac_address: "1c:1b:0d:e8:fb:af"
+      # enP2p1s0f2
+      - mac_address: "1c:1b:0d:60:ed:b3"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic3'
-      # enP2p1s0f3
-      - mac_address: "1c:1b:0d:e8:fb:b1"
+      # enP2p1s0f3, Not connected
+      - mac_address: "1c:1b:0d:60:ed:b4"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic4'
-      # enP2p1s0f4
-      - mac_address: "1c:1b:0d:e8:fb:b2"
+      # enP2p1s0f4, Not connected
+      - mac_address: "1c:1b:0d:60:ed:b5"
         speed: 10gb
         features: 'dpdk|sriov'
         name: 'nic5'
-      # enP2p1s0f5
-      - mac_address: "1c:1b:0d:e8:fb:b3"
+      # enP2p1s0f5, Not connected
+      - mac_address: "1c:1b:0d:60:ed:b6"
         speed: 40gb
         features: 'dpdk|sriov'
         name: 'nic6'
-- 
cgit 1.2.3-korg