From: agardner Date: Fri, 24 Nov 2017 19:43:18 +0000 (-0500) Subject: Moving all pdfs to pharos repo X-Git-Tag: 6.0.0~64^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6a54bb6cdf1aefd1f176b7de6e7b0e3d4df8f18b;p=pharos.git Moving all pdfs to pharos repo Inline encrytion of yaml files allows us to make away with securedlab's restrictions Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Change-Id: Ic2db523e7f82a0fb48e462a1fbe1402267f22618 Signed-off-by: agardner --- diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml new file mode 100644 index 00000000..52ea6eda --- /dev/null +++ b/labs/arm/idf-pod5.yaml @@ -0,0 +1,38 @@ +############################################################################## +# 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 5 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'admin7_br0' + mgmt: 'mgmt7_br0' + private: '' + public: 'public7_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 + - 'eth0' + - 'eth1' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - 'e0700000.xgmac' + - 'e0900000.xgmac' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml new file mode 100644 index 00000000..db03686d --- /dev/null +++ b/labs/arm/idf-pod6.yaml @@ -0,0 +1,46 @@ +############################################################################## +# 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 diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml new file mode 100644 index 00000000..7ee358fc --- /dev/null +++ b/labs/arm/pod5.yaml @@ -0,0 +1,209 @@ +--- +### Enea ARM POD 5 descriptor file ### + +details: + pod_owner: ENEA AB + contact: dan.lilliehorn@enea.com + lab: ENEA lab + location: Stockholm, Sweden + 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: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 128G + disks: + - name: disk1 + disk_capacity: 500G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: admin + remote_management: + <<: *remote_params + address: 10.0.1.32 + mac_address: "40:8D:5C:BA:B9:6A" + interfaces: + # Connected, used only for admin/PXE + - mac_address: "68:05:ca:34:60:e3" + speed: 1gb + features: '' + # Not connected for now + - mac_address: "00:0f:b7:04:00:c1" + speed: 40gb + features: 'dpdk|sriov' + # Not connected for now + - mac_address: "00:0f:b7:04:00:c2" + speed: 40gb + features: 'dpdk|sriov' + # 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 +############################################################################## +nodes: + - name: softiron-3 + node: &nodeparams + type: baremetal + vendor: Softiron + model: Overdrive 3000 + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 8 + memory: 32G + disks: &disks + - name: 'disk1' + disk_capacity: 128G + disk_type: ssd + disk_interface: sata + - name: 'disk2' + disk_capacity: 2048G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.8.3 + mac_address: "e0:ff:f7:00:04:99" + interfaces: + # Connected, used only for admin/PXE + - mac_address: "e0:ff:f7:00:08:ae" + speed: 10gb + features: '' + # 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: softiron-4 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.8.4 + mac_address: "e0:ff:f7:00:05:00" + interfaces: + - mac_address: "e0:ff:f7:00:08:b1" + speed: 10gb + features: '' + - 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: softiron-5 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.8.5 + mac_address: "e0:ff:f7:00:04:a9" + interfaces: + - mac_address: "e0:ff:f7:00:08:bd" + speed: 10gb + features: '' + - 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: softiron-6 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.8.6 + mac_address: "e0:ff:f7:00:04:78" + interfaces: + - mac_address: "e0:ff:f7:00:08:c6" + speed: 10gb + features: '' + - 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: softiron-7 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.8.7 + mac_address: "e0:ff:f7:00:05:19" + interfaces: + - mac_address: "e0:ff:f7:00:08:cf" + speed: 10gb + features: '' + - 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 diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml new file mode 100644 index 00000000..f4f92ddd --- /dev/null +++ b/labs/arm/pod6.yaml @@ -0,0 +1,280 @@ +--- +### Enea ARM POD 6 descriptor file ### + +details: + pod_owner: ENEA AB + contact: dan.lilliehorn@enea.com + lab: ENEA lab + location: Stockholm, Sweden + 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: + type: baremetal + vendor: AppliedMicro + model: XGene 1 + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm + cores: 8 + memory: 32G + disks: + ## /dev/sda + - name: disk1 + disk_capacity: 120G + disk_type: ssd + disk_interface: sata + ## /dev/sdb + - name: disk2 + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + ## /dev/sdc + - name: disk3 + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + remote_management: + <<: *remote_params + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" + interfaces: + ## eth0, Not connected for now + - mac_address: "00:01:73:02:36:d4" + speed: 1gb + features: '' + ## eth1, Connected, used only for admin/PXE + - mac_address: "00:01:73:02:36:d5" + speed: 1gb + features: '' + ## eth2, Not connected for now + - mac_address: "00:01:73:02:36:d6" + speed: 1gb + features: '' + ## 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 +############################################################################## +nodes: + - name: cn8890-24 + node: &nodeparams + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 62G + disks: &disks + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + remote_management: + <<: *remote_params + address: 10.0.1.54 + mac_address: "1c:1b:0d:e8:fa:8b" + interfaces: + ## enP5p144s0, Connected, used only for admin/PXE + - mac_address: "68:05:ca:5a:c3:a7" + speed: 1gb + features: '' + ## enP2p1s0f1, Connected, trunk for all other VLANs + - mac_address: "1c:1b:0d:e8:fa:83" + speed: 10gb + features: 'dpdk|sriov' + ## enP2p1s0f2, Not connected for now + - mac_address: "1c:1b:0d:e8:fa:84" + speed: 10gb + features: 'dpdk|sriov' + ## enP2p1s0f3, Not connected for now + - mac_address: "1c:1b:0d:e8:fa:85" + speed: 10gb + features: 'dpdk|sriov' + ## enP2p1s0f4, Not connected for now + - mac_address: "1c:1b:0d:e8:fa:86" + speed: 10gb + features: 'dpdk|sriov' + ## 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: cn8890-25 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.1.55 + mac_address: "1c:1b:0d:e8:fa:ad" + interfaces: + - mac_address: "68:05:ca:5a:c3:bc" + speed: 1gb + features: '' + - mac_address: "1c:1b:0d:e8:fb:a5" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:a6" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:a7" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:a8" + speed: 10gb + features: 'dpdk|sriov' + - 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: cn8890-26 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.1.56 + mac_address: "1c:1b:0d:e8:fa:6d" + interfaces: + - mac_address: "68:05:ca:61:b9:00" + speed: 1gb + features: '' + - mac_address: "1c:1b:0d:e8:fa:65" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fa:66" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fa:67" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fa:68" + speed: 10gb + features: 'dpdk|sriov' + - 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: cn8890-27 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.1.57 + mac_address: "1c:1b:0d:e8:fb:21" + interfaces: + - mac_address: "68:05:ca:57:f7:16" + speed: 1gb + features: '' + - mac_address: "1c:1b:0d:e8:fb:19" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:1a" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:1b" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:1c" + speed: 10gb + features: 'dpdk|sriov' + - 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: cn8890-28 + node: *nodeparams + disk: *disks + remote_management: + <<: *remote_params + address: 10.0.1.58 + mac_address: "1c:1b:0d:e8:fb:85" + interfaces: + - mac_address: "68:05:ca:61:97:5a" + speed: 1gb + features: '' + - mac_address: "1c:1b:0d:e8:fb:7d" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:7e" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:7f" + speed: 10gb + features: 'dpdk|sriov' + - mac_address: "1c:1b:0d:e8:fb:80" + speed: 10gb + features: 'dpdk|sriov' + - 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