summaryrefslogtreecommitdiffstats
path: root/labs/lf
diff options
context:
space:
mode:
Diffstat (limited to 'labs/lf')
-rw-r--r--labs/lf/idf-pod2.yaml2
-rw-r--r--labs/lf/idf-pod5.yaml2
-rw-r--r--labs/lf/pod2.yaml58
-rw-r--r--labs/lf/pod5.yaml52
4 files changed, 62 insertions, 52 deletions
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index c3ad1714..a2c00967 100644
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, 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
diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index b7d05cfb..59064f3c 100644
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 Linux Foundation, 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
diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml
index 6f684735..ab60bdb8 100644
--- a/labs/lf/pod2.yaml
+++ b/labs/lf/pod2.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
---
### LF POD 2 descriptor file ###
@@ -25,7 +32,7 @@ jumphost:
disk_capacity: 2400G
disk_type: hdd
disk_interface: sas
- disk_rotation:
+ disk_rotation: 0
os: centos-7
remote_params: &remote_params
type: ipmi
@@ -41,19 +48,20 @@ jumphost:
- mac_address: "00:25:b5:a0:00:1a"
speed: 40gb
features: 'dpdk|sriov'
+ address: 192.168.11.1
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:1b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:1c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:1d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.1
- mgmt: 10.167.4.1
- public: 172.30.10.72
+ name: 'nic4'
##############################################################################
nodes:
- name: pod2-node1
@@ -75,19 +83,19 @@ nodes:
- mac_address: "00:25:b5:a0:00:2a"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:2b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:2c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:2d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.2
- mgmt: 10.167.4.2
- public: 172.30.10.2
+ name: 'nic4'
############################################################################
- name: pod2-node2
node: *nodeparams
@@ -100,19 +108,19 @@ nodes:
- mac_address: "00:25:b5:a0:00:3a"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:3b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:3c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:3d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.3
- mgmt: 10.167.4.3
- public: 172.30.10.3
+ name: 'nic4'
############################################################################
- name: pod2-node3
node: *nodeparams
@@ -125,19 +133,19 @@ nodes:
- mac_address: "00:25:b5:a0:00:4a"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:4b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:4c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:4d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.4
- mgmt: 10.167.4.4
- public: 172.30.10.4
+ name: 'nic4'
############################################################################
- name: pod2-node4
node: *nodeparams
@@ -150,19 +158,19 @@ nodes:
- mac_address: "00:25:b5:a0:00:5a"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:5b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:5c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:5d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.5
- mgmt: 10.167.4.5
- public: 172.30.10.5
+ name: 'nic4'
############################################################################
- name: pod2-node5
node: *nodeparams
@@ -175,16 +183,16 @@ nodes:
- mac_address: "00:25:b5:a0:00:6a"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:25:b5:a0:00:6b"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:25:b5:a0:00:6c"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "00:25:b5:a0:00:6d"
speed: 40gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.6
- mgmt: 10.167.4.6
- public: 172.30.10.6
+ name: 'nic4'
diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml
index ffb1b90d..60ab4029 100644
--- a/labs/lf/pod5.yaml
+++ b/labs/lf/pod5.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 Linux Foundation, 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
+##############################################################################
---
### LF POD 5 descriptor file ###
@@ -24,7 +31,7 @@ jumphost:
disk_capacity: 480G
disk_type: ssd
disk_interface: sata
- disk_rotation:
+ disk_rotation: 0
os: centos-7
remote_params: &remote_params
type: ipmi
@@ -40,16 +47,16 @@ jumphost:
- mac_address: "a4:bf:01:01:ad:71"
speed: 1gb
features: 'dpdk|sriov'
+ address: 10.20.0.129
+ name: 'nic1'
- mac_address: "00:1e:67:fd:9c:c2"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:fd:9c:c3"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.129
- mgmt: 192.168.0.130
- public: 172.30.13.89
+ name: 'nic3'
nodes:
- name: pod5-node1
node: *nodeparas
@@ -62,16 +69,15 @@ nodes:
- mac_address: "a4:bf:01:01:a9:fc"
speed: 1gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:1e:67:f6:9b:34"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:f6:9b:35"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.130
- mgmt: 192.168.0.131
- public: 172.30.13.90
+ name: 'nic3'
- name: pod5-node2
node: *nodeparas
disks: *disks
@@ -83,16 +89,15 @@ nodes:
- mac_address: "a4:bf:01:01:a9:d4"
speed: 1gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:1e:67:f6:9b:36"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:f6:9b:37"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.131
- mgmt: 192.168.0.132
- public: 172.30.13.91
+ name: 'nic3'
- name: pod5-node3
node: *nodeparas
disks: *disks
@@ -104,16 +109,15 @@ nodes:
- mac_address: "a4:bf:01:00:97:a2"
speed: 1gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:1e:67:fd:9c:b0"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:fd:9c:b1"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.132
- mgmt: 192.168.0.133
- public: 172.30.13.92
+ name: 'nic3'
- name: pod5-node4
node: *nodeparas
disks: *disks
@@ -125,16 +129,15 @@ nodes:
- mac_address: "a4:bf:01:01:72:73"
speed: 1gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:1e:67:fd:99:24"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:fd:99:25"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.133
- mgmt: 192.168.0.134
- public: 172.30.13.93
+ name: 'nic3'
- name: pod5-node5
node: *nodeparas
disks: *disks
@@ -146,13 +149,12 @@ nodes:
- mac_address: "a4:bf:01:01:74:30"
speed: 1gb
features: 'dpdk|sriov'
+ name: 'nic1'
- mac_address: "00:1e:67:f6:9b:96"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "00:1e:67:f6:9b:97"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 10.20.0.134
- mgmt: 192.168.0.135
- public: 172.30.13.94
+ name: 'nic3'