LF-POD4 PDF/IDF

PDF+IDF for LF POD4 inspired from securelab PDF and LF-pod2 XDFs.

Change-Id: If7ee14efe5f279104a18d2a3281aa7b23bdf704a

diff --git a/config/pdf/idf-pod1.schema.yaml b/config/pdf/idf-pod1.schema.yaml
index 857749c..49e06e6 100644 (file)
--- a/config/pdf/idf-pod1.schema.yaml
+++ b/config/pdf/idf-pod1.schema.yaml
@@ -132,7 +132,7 @@ definitions:
       additionalProperties: false
   osa:
     v0.1:
-      type: 'object'
+      type: ['object', 'null']
       # NOTE: To be properly modeled by XCI maintainers
 
 ##############################################################################
@@ -163,7 +163,7 @@ properties:
       fuel:
         type: 'object'
       osa:
-        type: 'object'
+        type: ['object', 'null']
     required: ['version']
     additionalProperties: false
     ############################################################################
@@ -189,6 +189,9 @@ properties:
         required: ['net_config']
       osa:
         required: ['net_config']
+  xci:
+    type: 'object'
+    # NOTE: To be properly modeled by XCI maintainers
 
 # Do not allow any properties not defined here. This lets us catch typos.
 additionalProperties: false

diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml
index 09939d2..c8f6cf2 100644 (file)
--- a/labs/lf/idf-pod4.yaml
+++ b/labs/lf/idf-pod4.yaml
@@ -10,7 +10,7 @@
 
 idf:
   version: 0.1
-  net_config:
+  net_config: &net_config
     oob:
       interface: 0
       ip-range: 172.30.8.83-172.30.8.88
@@ -19,6 +19,8 @@ idf:
       interface: 0
       vlan: native
       network: 192.168.12.0
+      gateway: 192.168.12.1
+      dns: 8.8.8.8
       mask: 24
     mgmt:
       interface: 1
@@ -26,17 +28,17 @@ idf:
       network: 192.168.3.0
       mask: 24
     storage:
-      interface: 2
+      interface: 3
       vlan: 451
       network: 192.168.4.0
       mask: 24
     private:
-      interface: 1
+      interface: 2
       vlan: 452
       network: 192.168.5.0
       mask: 24
     public:
-      interface: 2
+      interface: 4
       vlan: 414
       network: 172.30.12.64
       mask: 26
@@ -44,6 +46,7 @@ idf:
       dns:
         - 8.8.8.8
         - 8.8.4.4
+  osa: &idf_osa
   fuel:
     jumphost:
       bridges:
@@ -72,3 +75,35 @@ idf:
           busaddr: *busaddr
         - interfaces: *interfaces
           busaddr: *busaddr
+xci:
+  pod_name: lf-pod4
+  net_config: *net_config
+  nodes_roles:
+    opnfv_host: [opnfv_host]
+    pod4-node1: [compute, storage]
+    pod4-node2: [compute, storage]
+    pod4-node3: [controller, storage]
+    pod4-node4: [controller, storage]
+    pod4-node5: [controller, storage]
+
+  # net_config network to be used by the PXE
+  pxe_network: admin
+
+  # As the MAC of generated bridges are generated, we use a list of local
+  # bridges to create libvirt networks
+  jumphost_interfaces_bridges:
+    - name: br_admin
+      ip:
+
+  extra_addresses:
+    opnfv_host: 192.168.12.2
+
+  # network mapping
+  network_mapping:
+    net-mgmt: admin
+    net-storage: storage
+    net-internal: private
+    net-vnf: public
+
+  installers:
+    osa: *idf_osa

diff --git a/labs/lf/pod4.yaml b/labs/lf/pod4.yaml
index 2163c9c..32a51b6 100644 (file)
--- a/labs/lf/pod4.yaml
+++ b/labs/lf/pod4.yaml
@@ -45,19 +45,42 @@ jumphost:
     address: 172.30.8.83
     mac_address: "a4:bf:01:01:b0:bb"
   interfaces:
-    - mac_address: "a4:bf:01:01:b0:b9"
+    - &interface_common_nic1  # admin
+      name: nic1
       speed: 1gb
+      features: 'dpdk|sriov'
+      vlan: native
+      mac_address: "a4:bf:01:01:b0:b9"
       address: 192.168.12.1
-      name: 'nic1'
+    - &interface_common_nic2  # mgmt
+      name: nic2
+      speed: 10gb
+      features: 'dpdk|sriov'
+      vlan: 450
+      mac_address: "00:1e:67:fd:9a:04"
+      address: 192.168.0.2
+    - &interface_common_nic3  # private
+      name: nic3
+      speed: 10gb
       features: 'dpdk|sriov'
-    - mac_address: "00:1e:67:fd:9a:04"
+      vlan: 452
+      mac_address: "00:1e:67:fd:9a:04"
+      address: 192.168.2.2
+    - &interface_common_nic4  # storage
+      name: nic4
       speed: 10gb
       features: 'dpdk|sriov'
-      name: 'nic2'
-    - mac_address: "00:1e:67:fd:9a:05"
+      vlan: 451
+      mac_address: "00:1e:67:fd:9a:05"
+      address: 192.168.1.2
+    - &interface_common_nic5  # public
+      name: nic5
       speed: 10gb
       features: 'dpdk|sriov'
-      name: 'nic3'
+      vlan: 414
+      mac_address: "00:1e:67:fd:9a:05"
+      address: 172.30.12.83
+##############################################################################
 nodes:
   - name: pod4-node1
     node: *nodeparams
@@ -68,17 +91,21 @@ nodes:
       mac_address: "a4:bf:01:01:ab:b6"
     interfaces:
       - mac_address: "a4:bf:01:01:ab:b4"
-        speed: 1gb
-        features: 'dpdk|sriov'
-        name: 'nic1'
+        address: 192.168.12.4
+        <<: *interface_common_nic1
+      - mac_address: "00:1e:67:fd:9b:32"
+        address: 192.168.0.4
+        <<: *interface_common_nic2
       - mac_address: "00:1e:67:fd:9b:32"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic2'
+        address: 192.168.2.4
+        <<: *interface_common_nic3
       - mac_address: "00:1e:67:fd:9b:33"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic3'
+        address: 192.168.1.4
+        <<: *interface_common_nic4
+      - mac_address: "00:1e:67:fd:9b:33"
+        address: 172.30.12.84
+        <<: *interface_common_nic5
+  ############################################################################
   - name: pod4-node2
     node: *nodeparams
     disks: *disks
@@ -88,17 +115,21 @@ nodes:
       mac_address: "a4:bf:01:01:b6:97"
     interfaces:
       - mac_address: "a4:bf:01:01:b6:95"
-        speed: 1gb
-        features: 'dpdk|sriov'
-        name: 'nic1'
+        address: 192.168.12.5
+        <<: *interface_common_nic1
+      - mac_address: "00:1e:67:fd:98:e2"
+        address: 192.168.0.5
+        <<: *interface_common_nic2
       - mac_address: "00:1e:67:fd:98:e2"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic2'
+        address: 192.168.2.5
+        <<: *interface_common_nic3
       - mac_address: "00:1e:67:fd:98:e3"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic3'
+        address: 192.168.1.5
+        <<: *interface_common_nic4
+      - mac_address: "00:1e:67:fd:98:e3"
+        address: 172.30.12.85
+        <<: *interface_common_nic5
+  ############################################################################
   - name: pod4-node3
     node: *nodeparams
     disks: *disks
@@ -108,17 +139,21 @@ nodes:
       mac_address: "a4:bf:01:01:66:fe"
     interfaces:
       - mac_address: "a4:bf:01:01:66:fc"
-        speed: 1gb
-        features: 'dpdk|sriov'
-        name: 'nic1'
+        address: 192.168.12.6
+        <<: *interface_common_nic1
+      - mac_address: "00:1e:67:fd:9c:c8"
+        address: 192.168.0.6
+        <<: *interface_common_nic2
       - mac_address: "00:1e:67:fd:9c:c8"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic2'
+        address: 192.168.2.6
+        <<: *interface_common_nic3
       - mac_address: "00:1e:67:fd:9c:c9"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic3'
+        address: 192.168.1.6
+        <<: *interface_common_nic4
+      - mac_address: "00:1e:67:fd:9c:c9"
+        address: 172.30.12.86
+        <<: *interface_common_nic5
+  ############################################################################
   - name: pod4-node4
     node: *nodeparams
     disks: *disks
@@ -128,17 +163,21 @@ nodes:
       mac_address: "a4:bf:01:01:b2:f5"
     interfaces:
       - mac_address: "a4:bf:01:01:b2:f3"
-        speed: 1gb
-        features: 'dpdk|sriov'
-        name: 'nic1'
+        address: 192.168.12.7
+        <<: *interface_common_nic1
+      - mac_address: "00:1e:67:fd:9b:38"
+        address: 192.168.0.7
+        <<: *interface_common_nic2
       - mac_address: "00:1e:67:fd:9b:38"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic2'
+        address: 192.168.2.7
+        <<: *interface_common_nic3
       - mac_address: "00:1e:67:fd:9b:39"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic3'
+        address: 192.168.1.7
+        <<: *interface_common_nic4
+      - mac_address: "00:1e:67:fd:9b:39"
+        address: 172.30.12.87
+        <<: *interface_common_nic5
+  ############################################################################
   - name: pod4-node5
     node: *nodeparams
     disks: *disks
@@ -148,14 +187,17 @@ nodes:
       mac_address: "a4:bf:01:01:b5:11"
     interfaces:
       - mac_address: "a4:bf:01:01:b5:0f"
-        speed: 1gb
-        features: 'dpdk|sriov'
-        name: 'nic1'
+        address: 192.168.12.8
+        <<: *interface_common_nic1
+      - mac_address: "00:1e:67:fd:99:40"
+        address: 192.168.0.8
+        <<: *interface_common_nic2
       - mac_address: "00:1e:67:fd:99:40"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic2'
+        address: 192.168.2.8
+        <<: *interface_common_nic3
+      - mac_address: "00:1e:67:fd:99:41"
+        address: 192.168.1.8
+        <<: *interface_common_nic4
       - mac_address: "00:1e:67:fd:99:41"
-        speed: 10gb
-        features: 'dpdk|sriov'
-        name: 'nic3'
+        address: 172.30.12.88
+        <<: *interface_common_nic5