summaryrefslogtreecommitdiffstats
path: root/labs/ericsson
diff options
context:
space:
mode:
Diffstat (limited to 'labs/ericsson')
-rw-r--r--labs/ericsson/idf-pod1.yaml36
-rw-r--r--labs/ericsson/pod1.yaml106
-rw-r--r--labs/ericsson/pod2.yaml76
3 files changed, 80 insertions, 138 deletions
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 9b4a98d4..d9042544 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 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
@@ -10,6 +10,40 @@
idf:
version: 0.1
+ net_config:
+ 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
fuel:
jumphost:
bridges:
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index 76ca002f..ae04b309 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 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
@@ -16,44 +16,6 @@ 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
@@ -84,40 +46,36 @@ jumphost:
address: 172.16.1.21/24
mac_address: "9C:B6:54:8E:C5:76"
interfaces:
- - nic: 'nic1'
+ - name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
address: 100.64.200.5/24
mac_address: "38:ea:a7:8f:53:00"
vlan: 80
- - nic: 'nic2'
+ - name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:53:01"
vlan: native
- - nic: 'nic3'
+ - name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
address: 172.16.0.250/16
mac_address: "38:ea:a7:8f:06:00"
vlan: native
- - nic: 'nic4'
+ - name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:06:01"
vlan: native
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "9c:b6:54:8a:05:70"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "9c:b6:54:8a:05:74"
vlan: native
##############################################################################
@@ -133,33 +91,27 @@ nodes:
- name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:98"
- name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:99"
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:84"
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:85"
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "14:58:d0:54:e7:88"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "00:00:00:00:00:00"
vlan: native
############################################################################
@@ -174,33 +126,27 @@ nodes:
- name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:7c"
- name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:7d"
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:6c"
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6b:6d"
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "14:58:d0:54:6a:60"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "00:00:00:00:00:00"
vlan: native
############################################################################
@@ -215,33 +161,27 @@ nodes:
- name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6a:38"
- name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6a:39"
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6a:3c"
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:17:6a:3d"
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "14:58:d0:54:7a:28"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "00:00:00:00:00:00"
vlan: native
############################################################################
@@ -256,33 +196,27 @@ nodes:
- name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:1f:d4"
- name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:1f:d5"
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:52:cc"
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:52:cd"
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "9c:b6:54:8a:95:a0"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "00:00:00:00:00:00"
vlan: native
############################################################################
@@ -297,32 +231,26 @@ nodes:
- name: 'nic1'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:07:50"
- name: 'nic2'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:07:51"
- name: 'nic3'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:12:48"
- name: 'nic4'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "38:ea:a7:8f:12:49"
- - nic: 'nic5'
+ - name: 'nic5'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "9c:b6:54:8a:10:18"
vlan: native
- - nic: 'nic6'
+ - name: 'nic6'
speed: 10gb
features: 'dpdk|sriov'
- address:
mac_address: "00:00:00:00:00:00"
vlan: native
diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
index c6477faf..8814c42d 100644
--- a/labs/ericsson/pod2.yaml
+++ b/labs/ericsson/pod2.yaml
@@ -39,27 +39,27 @@ jumphost:
address: 172.16.2.11/24
mac_address: "58:20:B1:01:8A:F2"
interfaces:
- - nic: 'nic1'
+ - name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 100.64.201.5/24
mac_address: "5c:b9:01:8b:9f:e8"
vlan: 84
- - nic: 'nic2'
+ - name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 100.64.201.5/24
mac_address: "5c:b9:01:8b:9f:e9"
vlan: native
- - nic: 'nic3'
+ - name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 172.16.0.248/16
mac_address: "5c:b9:01:8b:9f:ec"
vlan: native
- - nic: 'nic4'
+ - name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
+ features: 'dpdk|sriov'
address: 172.16.0.248/16
mac_address: "5c:b9:01:8b:9f:ed"
vlan: native
@@ -75,23 +75,19 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:94"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:95"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:80"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:81"
############################################################################
- name: CI-ERICSSON-POD2-NODE2
@@ -104,23 +100,19 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:30"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:31"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:99:64"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:99:65" # second port, no connection
############################################################################
- name: CI-ERICSSON-POD2-NODE3
@@ -133,23 +125,19 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:9d:4c"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:9d:4d"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:9d:6c"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:9d:6d"
############################################################################
- name: CI-ERICSSON-POD2-NODE4
@@ -162,23 +150,19 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a5:fc"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a5:fd"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:08"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:09"
############################################################################
- name: CI-ERICSSON-POD2-NODE5
@@ -191,21 +175,17 @@ nodes:
interfaces:
- name: 'nic1'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:e8"
- name: 'nic2'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:a6:e9"
- name: 'nic3'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:97:14"
- name: 'nic4'
speed: 10gb
- features: 'dpdk,sriov'
- address:
+ features: 'dpdk|sriov'
mac_address: "5c:b9:01:8b:97:15"