1 files changed, 79 insertions, 46 deletions
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index db03686d..9246c4f7 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -1,46 +1,79 @@
-##############################################################################
-# Copyright (c) 2017 Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
----
-### ARM POD 6 installer descriptor file ###
-
-idf:
-  version: 0.1
-  fuel:
-    jumphost:
-      bridges:
-        admin: 'admin14_br0'
-        mgmt: 'mgmt14_br0'
-        private: ''
-        public: 'public14_br0'
-    network:
-      node:
-        # Ordered-list, index should be in sync with node index in PDF
-        - interfaces: &interfaces
-            # Ordered-list, index should be in sync with interface index in PDF
-            - 'enP5p144s0'
-            - 'enP2p1s0f1'
-            - 'enP2p1s0f2'
-            - 'enP2p1s0f3'
-            - 'enP2p1s0f4'
-            - 'enP2p1s0f5'
-          busaddr: &busaddr
-            # Bus-info reported by `ethtool -i ethX`
-            - '0005:90:00.0'
-            - '0002:01:00.1'
-            - '0002:01:00.2'
-            - '0002:01:00.3'
-            - '0002:01:00.4'
-            - '0002:01:00.5'
-        - interfaces: *interfaces
-          busaddr: *busaddr
-        - interfaces: *interfaces
-          busaddr: *busaddr
-        - interfaces: *interfaces
-          busaddr: *busaddr
-        - interfaces: *interfaces
-          busaddr: *busaddr
+##############################################################################
+# Copyright (c) 2018 Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ARM POD 6 installer descriptor file ###
+
+idf:
+  version: 0.1
+  net_config:
+    oob:
+      ip-range: 10.0.1.54-10.0.1.58
+      vlan: native
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2323
+      network: 172.16.10.0
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2324
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 1
+      vlan: 2325
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.15.0
+      mask: 24
+      gateway: 10.0.15.254
+      dns:
+        - 8.8.8.8
+        - 8.8.4.4
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin14_br0'
+        mgmt: 'mgmt14_br0'
+        private: ~
+        public: 'public14_br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enP5p144s0'
+            - 'enP2p1s0f1'
+            - 'enP2p1s0f2'
+            - 'enP2p1s0f3'
+            - 'enP2p1s0f4'
+            - 'enP2p1s0f5'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0005:90:00.0'
+            - '0002:01:00.1'
+            - '0002:01:00.2'
+            - '0002:01:00.3'
+            - '0002:01:00.4'
+            - '0002:01:00.5'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr