[fuel] Parameterize tenant VLAN ranges

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

diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index c803522..50db0cf 100644 (file)
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -10,6 +10,9 @@
 
 idf:
   version: 0.1
+  # NOTE: Compass & Joid are not supported on this POD since they require at
+  # least 3 network ports on all nodes.
+  installer: ['apex', 'daisy', 'fuel']
   net_config:
     oob:
       ip-range: 10.0.8.3-10.0.8.10
@@ -23,6 +26,7 @@ idf:
       interface: 1
       vlan: 2183
       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
@@ -31,13 +35,14 @@ idf:
       mask: 24
     private:
       interface: 1
-      vlan: 2185
+      vlan: 2185-2200
       network: 10.1.0.0
       mask: 24
     public:
       interface: 1
       vlan: native
       network: 10.0.8.0
+      ip-range: 10.0.8.100-10.0.8.253  # Some IPs are in use by lab infra
       mask: 24
       gateway: 10.0.8.254
       dns:
@@ -50,6 +55,10 @@ idf:
         mgmt: 'mgmt7_br0'
         private: ~
         public: 'public7_br0'
+    maas:
+      # MaaS timeouts (in minutes)
+      timeout_comissioning: 10
+      timeout_deploying: 15
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF
@@ -69,3 +78,29 @@ idf:
           busaddr: *busaddr
         - interfaces: *interfaces
           busaddr: *busaddr
+    reclass:
+      node:
+        - compute_params: &compute_params
+            common:
+              nova_cpu_pinning: &nova_cpu_pinning_common "2,3,4,5,6,7"
+              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: "4-7"
+              compute_hugepages_size: 2M
+              compute_hugepages_count: 8192
+              compute_hugepages_mount: /mnt/hugepages_2M
+              compute_kernel_isolcpu: *nova_cpu_pinning_common
+              compute_dpdk_driver: vfio
+              compute_ovs_pmd_cpu_mask: "0xc"
+              compute_ovs_dpdk_socket_mem: "4096"
+              compute_ovs_dpdk_lcore_mask: "0xc"
+              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