summaryrefslogtreecommitdiffstats
path: root/labs/arm
diff options
context:
space:
mode:
Diffstat (limited to 'labs/arm')
-rw-r--r--labs/arm/idf-pod5.yaml37
-rw-r--r--labs/arm/idf-pod6.yaml125
-rw-r--r--labs/arm/pod5.yaml89
-rw-r--r--labs/arm/pod6.yaml110
4 files changed, 189 insertions, 172 deletions
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index 52ea6eda..c8035228 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -1,5 +1,5 @@
##############################################################################
-# Copyright (c) 2017 Enea AB and others.
+# Copyright (c) 2018 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,12 +10,45 @@
idf:
version: 0.1
+ net_config:
+ oob:
+ ip-range: 10.0.8.3-10.0.8.10
+ vlan: native
+ admin:
+ interface: 0
+ vlan: native
+ network: 192.168.11.0
+ mask: 24
+ mgmt:
+ interface: 1
+ vlan: 2183
+ network: 172.16.10.0
+ mask: 24
+ storage:
+ interface: 1
+ vlan: 2184
+ network: 10.2.0.0
+ mask: 24
+ private:
+ interface: 1
+ vlan: 2185
+ network: 10.1.0.0
+ mask: 24
+ public:
+ interface: 1
+ vlan: native
+ network: 10.0.8.0
+ mask: 24
+ gateway: 10.0.8.254
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
fuel:
jumphost:
bridges:
admin: 'admin7_br0'
mgmt: 'mgmt7_br0'
- private: ''
+ private: ~
public: 'public7_br0'
network:
node:
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index db03686d..9246c4f7 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -1,46 +1,79 @@
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
----
-### ARM POD 6 installer descriptor file ###
-
-idf:
- version: 0.1
- fuel:
- jumphost:
- bridges:
- admin: 'admin14_br0'
- mgmt: 'mgmt14_br0'
- private: ''
- public: 'public14_br0'
- network:
- node:
- # Ordered-list, index should be in sync with node index in PDF
- - interfaces: &interfaces
- # Ordered-list, index should be in sync with interface index in PDF
- - 'enP5p144s0'
- - 'enP2p1s0f1'
- - 'enP2p1s0f2'
- - 'enP2p1s0f3'
- - 'enP2p1s0f4'
- - 'enP2p1s0f5'
- busaddr: &busaddr
- # Bus-info reported by `ethtool -i ethX`
- - '0005:90:00.0'
- - '0002:01:00.1'
- - '0002:01:00.2'
- - '0002:01:00.3'
- - '0002:01:00.4'
- - '0002:01:00.5'
- - interfaces: *interfaces
- busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
+---
+### ARM POD 6 installer descriptor file ###
+
+idf:
+ version: 0.1
+ net_config:
+ oob:
+ ip-range: 10.0.1.54-10.0.1.58
+ vlan: native
+ admin:
+ interface: 0
+ vlan: native
+ network: 192.168.11.0
+ mask: 24
+ mgmt:
+ interface: 1
+ vlan: 2323
+ network: 172.16.10.0
+ mask: 24
+ storage:
+ interface: 1
+ vlan: 2324
+ network: 10.2.0.0
+ mask: 24
+ private:
+ interface: 1
+ vlan: 2325
+ network: 10.1.0.0
+ mask: 24
+ public:
+ interface: 1
+ vlan: native
+ network: 10.0.15.0
+ mask: 24
+ gateway: 10.0.15.254
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'admin14_br0'
+ mgmt: 'mgmt14_br0'
+ private: ~
+ public: 'public14_br0'
+ network:
+ node:
+ # Ordered-list, index should be in sync with node index in PDF
+ - interfaces: &interfaces
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'enP5p144s0'
+ - 'enP2p1s0f1'
+ - 'enP2p1s0f2'
+ - 'enP2p1s0f3'
+ - 'enP2p1s0f4'
+ - 'enP2p1s0f5'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0005:90:00.0'
+ - '0002:01:00.1'
+ - '0002:01:00.2'
+ - '0002:01:00.3'
+ - '0002:01:00.4'
+ - '0002:01:00.5'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 7ee358fc..3708b7f0 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
---
### Enea ARM POD 5 descriptor file ###
@@ -9,40 +16,6 @@ details:
type: production
link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
##############################################################################
-net_config:
- oob:
- ip-range: 10.0.8.3-10.0.8.10
- vlan: native
- admin:
- interface: 0
- vlan: native
- network: 192.168.11.0
- mask: 24
- mgmt:
- interface: 1
- vlan: 2183
- network: 172.16.10.0
- mask: 24
- storage:
- interface: 1
- vlan: 2184
- network: 10.2.0.0
- mask: 24
- private:
- interface: 1
- vlan: 2185
- network: 10.1.0.0
- mask: 24
- public:
- interface: 1
- vlan: native
- network: 10.0.8.0
- mask: 24
- gateway: 10.0.8.254
- dns:
- - 8.8.8.8
- - 8.8.4.4
-##############################################################################
jumphost:
name: jenkins-slave-arm-pod5
node:
@@ -74,24 +47,25 @@ jumphost:
interfaces:
# Connected, used only for admin/PXE
- mac_address: "68:05:ca:34:60:e3"
+ address: 192.168.11.1
speed: 1gb
features: ''
+ name: 'nic1'
# Not connected for now
- mac_address: "00:0f:b7:04:00:c1"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic2'
# Not connected for now
- mac_address: "00:0f:b7:04:00:c2"
speed: 40gb
features: 'dpdk|sriov'
+ name: 'nic3'
# Connected, trunk for all other VLANs
- mac_address: "00:0f:b7:04:00:c0"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.1
- mgmt: 172.16.10.1
- public: 10.0.8.9
+ name: 'nic4'
##############################################################################
nodes:
- name: softiron-3
@@ -109,6 +83,7 @@ nodes:
disk_capacity: 128G
disk_type: ssd
disk_interface: sata
+ disk_rotation: 0
- name: 'disk2'
disk_capacity: 2048G
disk_type: hdd
@@ -123,18 +98,16 @@ nodes:
- mac_address: "e0:ff:f7:00:08:ae"
speed: 10gb
features: ''
+ name: 'nic1'
# Connected, trunk for all other VLANs
- mac_address: "e0:ff:f7:00:08:af"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.2
- mgmt: 172.16.10.141
- public: 10.0.8.141
+ name: 'nic2'
############################################################################
- name: softiron-4
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.8.4
@@ -143,17 +116,15 @@ nodes:
- mac_address: "e0:ff:f7:00:08:b1"
speed: 10gb
features: ''
+ name: 'nic1'
- mac_address: "e0:ff:f7:00:08:b2"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.3
- mgmt: 172.16.10.142
- public: 10.0.8.142
+ name: 'nic2'
############################################################################
- name: softiron-5
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.8.5
@@ -162,17 +133,15 @@ nodes:
- mac_address: "e0:ff:f7:00:08:bd"
speed: 10gb
features: ''
+ name: 'nic1'
- mac_address: "e0:ff:f7:00:08:be"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.4
- mgmt: 172.16.10.143
- public: 10.0.8.143
+ name: 'nic2'
############################################################################
- name: softiron-6
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.8.6
@@ -181,17 +150,15 @@ nodes:
- mac_address: "e0:ff:f7:00:08:c6"
speed: 10gb
features: ''
+ name: 'nic1'
- mac_address: "e0:ff:f7:00:08:c7"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.5
- mgmt: 172.16.10.101
- public: 10.0.8.101
+ name: 'nic2'
############################################################################
- name: softiron-7
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.8.7
@@ -200,10 +167,8 @@ nodes:
- mac_address: "e0:ff:f7:00:08:cf"
speed: 10gb
features: ''
+ name: 'nic1'
- mac_address: "e0:ff:f7:00:08:d0"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.6
- mgmt: 172.16.10.102
- public: 10.0.8.102
+ name: 'nic2'
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
index f4f92ddd..dc53888c 100644
--- a/labs/arm/pod6.yaml
+++ b/labs/arm/pod6.yaml
@@ -1,3 +1,10 @@
+##############################################################################
+# Copyright (c) 2018 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
+##############################################################################
---
### Enea ARM POD 6 descriptor file ###
@@ -9,40 +16,6 @@ details:
type: production
link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
##############################################################################
-net_config:
- oob:
- ip-range: 10.0.1.54-10.0.1.58
- vlan: native
- admin:
- interface: 0
- vlan: native
- network: 192.168.11.0
- mask: 24
- mgmt:
- interface: 1
- vlan: 2323
- network: 172.16.10.0
- mask: 24
- storage:
- interface: 1
- vlan: 2324
- network: 10.2.0.0
- mask: 24
- private:
- interface: 1
- vlan: 2325
- network: 10.1.0.0
- mask: 24
- public:
- interface: 1
- vlan: native
- network: 10.0.15.0
- mask: 24
- gateway: 10.0.15.254
- dns:
- - 8.8.8.8
- - 8.8.4.4
-##############################################################################
jumphost:
name: jenkins-slave-arm-pod6
node:
@@ -60,6 +33,7 @@ jumphost:
disk_capacity: 120G
disk_type: ssd
disk_interface: sata
+ disk_rotation: 0
## /dev/sdb
- name: disk2
disk_capacity: 1T
@@ -86,24 +60,25 @@ jumphost:
interfaces:
## eth0, Not connected for now
- mac_address: "00:01:73:02:36:d4"
+ address: 192.168.11.1
speed: 1gb
features: ''
+ name: 'nic1'
## eth1, Connected, used only for admin/PXE
- mac_address: "00:01:73:02:36:d5"
speed: 1gb
features: ''
+ name: 'nic2'
## eth2, Not connected for now
- mac_address: "00:01:73:02:36:d6"
speed: 1gb
features: ''
+ name: 'nic3'
## eth3, Connected, trunk for all other VLANs
- mac_address: "00:01:73:02:36:d7"
speed: 10gb
features: ''
- fixed_ips:
- admin: 192.168.11.1
- mgmt: 172.16.10.1
- public: 10.0.15.9
+ name: 'nic4'
##############################################################################
nodes:
- name: cn8890-24
@@ -121,6 +96,7 @@ nodes:
disk_capacity: 480G
disk_type: ssd
disk_interface: sata
+ disk_rotation: 0
remote_management:
<<: *remote_params
address: 10.0.1.54
@@ -130,34 +106,36 @@ nodes:
- mac_address: "68:05:ca:5a:c3:a7"
speed: 1gb
features: ''
+ name: 'nic1'
## enP2p1s0f1, Connected, trunk for all other VLANs
- mac_address: "1c:1b:0d:e8:fa:83"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
## enP2p1s0f2, Not connected for now
- mac_address: "1c:1b:0d:e8:fa:84"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic3'
## enP2p1s0f3, Not connected for now
- mac_address: "1c:1b:0d:e8:fa:85"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic4'
## enP2p1s0f4, Not connected for now
- mac_address: "1c:1b:0d:e8:fa:86"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic5'
## enP2p1s0f5, Not connected for now
- mac_address: "1c:1b:0d:e8:fa:87"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.2
- mgmt: 172.16.10.142
- public: 10.0.15.142
+ name: 'nic6'
############################################################################
- name: cn8890-25
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.1.55
@@ -166,29 +144,31 @@ nodes:
- mac_address: "68:05:ca:5a:c3:bc"
speed: 1gb
features: ''
+ name: 'nic1'
- mac_address: "1c:1b:0d:e8:fb:a5"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "1c:1b:0d:e8:fb:a6"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "1c:1b:0d:e8:fb:a7"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic4'
- mac_address: "1c:1b:0d:e8:fb:a8"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic5'
- mac_address: "1c:1b:0d:e8:fb:a9"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.3
- mgmt: 172.16.10.143
- public: 10.0.15.143
+ name: 'nic6'
############################################################################
- name: cn8890-26
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.1.56
@@ -197,29 +177,31 @@ nodes:
- mac_address: "68:05:ca:61:b9:00"
speed: 1gb
features: ''
+ name: 'nic1'
- mac_address: "1c:1b:0d:e8:fa:65"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "1c:1b:0d:e8:fa:66"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "1c:1b:0d:e8:fa:67"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic4'
- mac_address: "1c:1b:0d:e8:fa:68"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic5'
- mac_address: "1c:1b:0d:e8:fa:69"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.4
- mgmt: 172.16.10.144
- public: 10.0.15.144
+ name: 'nic6'
############################################################################
- name: cn8890-27
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.1.57
@@ -228,29 +210,31 @@ nodes:
- mac_address: "68:05:ca:57:f7:16"
speed: 1gb
features: ''
+ name: 'nic1'
- mac_address: "1c:1b:0d:e8:fb:19"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "1c:1b:0d:e8:fb:1a"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "1c:1b:0d:e8:fb:1b"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic4'
- mac_address: "1c:1b:0d:e8:fb:1c"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic5'
- mac_address: "1c:1b:0d:e8:fb:1d"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.5
- mgmt: 172.16.10.145
- public: 10.0.15.145
+ name: 'nic6'
############################################################################
- name: cn8890-28
node: *nodeparams
- disk: *disks
+ disks: *disks
remote_management:
<<: *remote_params
address: 10.0.1.58
@@ -259,22 +243,24 @@ nodes:
- mac_address: "68:05:ca:61:97:5a"
speed: 1gb
features: ''
+ name: 'nic1'
- mac_address: "1c:1b:0d:e8:fb:7d"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic2'
- mac_address: "1c:1b:0d:e8:fb:7e"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic3'
- mac_address: "1c:1b:0d:e8:fb:7f"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic4'
- mac_address: "1c:1b:0d:e8:fb:80"
speed: 10gb
features: 'dpdk|sriov'
+ name: 'nic5'
- mac_address: "1c:1b:0d:e8:fb:81"
speed: 10gb
features: 'dpdk|sriov'
- fixed_ips:
- admin: 192.168.11.6
- mgmt: 172.16.10.146
- public: 10.0.15.146
+ name: 'nic6'