[IDF] fuel, dpdk: Switch to 1G pgsz on ThunderX

[pharos.git] / labs / arm / idf-pod6.yaml

diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index db03686..6d6c9c3 100644 (file)
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -1,46 +1,115 @@
-##############################################################################\r
-# Copyright (c) 2017 Enea AB and others.\r
-# All rights reserved. This program and the accompanying materials\r
-# are made available under the terms of the Apache License, Version 2.0\r
-# which accompanies this distribution, and is available at\r
-# http://www.apache.org/licenses/LICENSE-2.0\r
-##############################################################################\r
----\r
-### ARM POD 6 installer descriptor file ###\r
-\r
-idf:\r
-  version: 0.1\r
-  fuel:\r
-    jumphost:\r
-      bridges:\r
-        admin: 'admin14_br0'\r
-        mgmt: 'mgmt14_br0'\r
-        private: ''\r
-        public: 'public14_br0'\r
-    network:\r
-      node:\r
-        # Ordered-list, index should be in sync with node index in PDF\r
-        - interfaces: &interfaces\r
-            # Ordered-list, index should be in sync with interface index in PDF\r
-            - 'enP5p144s0'\r
-            - 'enP2p1s0f1'\r
-            - 'enP2p1s0f2'\r
-            - 'enP2p1s0f3'\r
-            - 'enP2p1s0f4'\r
-            - 'enP2p1s0f5'\r
-          busaddr: &busaddr\r
-            # Bus-info reported by `ethtool -i ethX`\r
-            - '0005:90:00.0'\r
-            - '0002:01:00.1'\r
-            - '0002:01:00.2'\r
-            - '0002:01:00.3'\r
-            - '0002:01:00.4'\r
-            - '0002:01:00.5'\r
-        - interfaces: *interfaces\r
-          busaddr: *busaddr\r
-        - interfaces: *interfaces\r
-          busaddr: *busaddr\r
-        - interfaces: *interfaces\r
-          busaddr: *busaddr\r
-        - interfaces: *interfaces\r
-          busaddr: *busaddr\r
+##############################################################################
+# 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
+  installer: ['apex', 'compass4nfv', 'daisy', 'fuel']
+  net_config:
+    oob:
+      ip-range: 10.0.1.54-10.0.1.58
+      vlan: native
+      mask: 24
+    admin:
+      interface: 0
+      vlan: native
+      network: 192.168.11.0
+      mask: 24
+    mgmt:
+      interface: 1
+      vlan: 2323
+      network: 172.16.10.0
+      ip-range: 172.16.10.10-172.16.10.254  # Some IPs are in use by lab infra
+      mask: 24
+    storage:
+      interface: 1
+      vlan: 2324
+      network: 10.2.0.0
+      mask: 24
+    private:
+      interface: 2
+      vlan: 2325-2340
+      network: 10.1.0.0
+      mask: 24
+    public:
+      interface: 1
+      vlan: native
+      network: 10.0.15.0
+      ip-range: 10.0.15.100-10.0.15.253  # Some IPs are in use by lab infra
+      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'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
+    network:
+      ntp_strata_host1: 1.se.pool.ntp.org
+      ntp_strata_host2: 0.se.pool.ntp.org
+      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
+    reclass:
+      node:
+        - compute_params: &compute_params
+            common:
+              nova_cpu_pinning: &nova_cpu_pinning_common "8-47"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+            dpdk:
+              nova_cpu_pinning: "12-47"
+              compute_hugepages_size: 1G
+              compute_hugepages_count: 16
+              compute_hugepages_mount: /mnt/hugepages_1G
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+              compute_dpdk_driver: vfio
+              compute_ovs_pmd_cpu_mask: "0x300"
+              compute_ovs_dpdk_socket_mem: "2048"
+              compute_ovs_dpdk_lcore_mask: "0xC00"
+              compute_ovs_memory_channels: "2"
+              dpdk0_driver: vfio-pci
+              dpdk0_n_rxq: 2
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params
+        - compute_params: *compute_params