Merge "ericsson-pod1: Add net_config"

1 files changed, 81 insertions, 36 deletions

diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index 10424bd..faf7544 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2017 Ericsson AB, Mirantis Inc., 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
+##############################################################################
 ---
 ### POD descriptor file ###
 
@@ -9,6 +16,44 @@ details:
   type: production
   link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1
 ##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  # NOTE: Some networks (e.g. admin) are created by the installer
+  # NOTE: Network-to-interface mapping will be reworked after PDF update
+  oob:
+    interface: 0
+    ip-range: 172.16.1.16-172.16.1.21
+    vlan: native
+  admin:
+    interface: 4
+    vlan: native
+    network: 192.168.11.0  # Untagged, 'PXE/Admin' for MaaS (no IP on JP)
+    mask: 24
+  mgmt:
+    interface: 2
+    vlan: 81
+    network: 192.168.10.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 82
+    network: 192.168.20.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1000
+    network: 192.168.2.0
+    mask: 24
+  public:
+    interface: 2
+    vlan: 80
+    network: 100.64.200.0
+    mask: 24
+    gateway: 100.64.200.1
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+##############################################################################
 jumphost:
   name: CI-POD1-HOST
   node: &nodeparams
@@ -41,37 +86,37 @@ jumphost:
   interfaces:
     - nic: 'nic1'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 100.64.200.5/24
       mac_address: "38:ea:a7:8f:53:00"
       vlan: 80
     - nic: 'nic2'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address:
       mac_address: "38:ea:a7:8f:53:01"
       vlan: native
     - nic: 'nic3'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address: 172.16.0.250/16
       mac_address: "38:ea:a7:8f:06:00"
       vlan: native
     - nic: 'nic4'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address:
       mac_address: "38:ea:a7:8f:06:01"
       vlan: native
     - nic: 'nic5'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address:
       mac_address: "9c:b6:54:8a:05:70"
       vlan: native
     - nic: 'nic6'
       speed: 10gb
-      features: 'dpdk,sriov'
+      features: 'dpdk|sriov'
       address:
       mac_address: "9c:b6:54:8a:05:74"
       vlan: native
@@ -87,33 +132,33 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:98"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:99"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:84"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:85"
       - nic: 'nic5'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - nic: 'nic6'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
@@ -128,33 +173,33 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:7c"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:7d"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:6c"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6b:6d"
       - nic: 'nic5'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - nic: 'nic6'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
@@ -169,33 +214,33 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6a:38"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6a:39"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6a:3c"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:17:6a:3d"
       - nic: 'nic5'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - nic: 'nic6'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
@@ -210,33 +255,33 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:1f:d4"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:1f:d5"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:52:cc"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:52:cd"
       - nic: 'nic5'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - nic: 'nic6'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
@@ -251,33 +296,33 @@ nodes:
     interfaces:
       - name: 'nic1'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:07:50"
       - name: 'nic2'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:07:51"
       - name: 'nic3'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:12:48"
       - name: 'nic4'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "38:ea:a7:8f:12:49"
       - nic: 'nic5'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native
       - nic: 'nic6'
         speed: 10gb
-        features: 'dpdk,sriov'
+        features: 'dpdk|sriov'
         address:
         mac_address: "00:00:00:00:00:00"
         vlan: native