diff options
Diffstat (limited to 'mcp/config/labs/local')
| -rw-r--r-- | mcp/config/labs/local/idf-pod1.yaml | 43 | ||||
| -rw-r--r-- | mcp/config/labs/local/idf-virtual1.yaml | 101 | ||||
| -rw-r--r-- | mcp/config/labs/local/pod1.yaml | 90 | ||||
| -rw-r--r-- | mcp/config/labs/local/virtual1.yaml | 127 |
4 files changed, 296 insertions, 65 deletions
diff --git a/mcp/config/labs/local/idf-pod1.yaml b/mcp/config/labs/local/idf-pod1.yaml index 4ee359f88..b916707a1 100644 --- a/mcp/config/labs/local/idf-pod1.yaml +++ b/mcp/config/labs/local/idf-pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 Linux Foundation, 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,13 +10,50 @@ idf: version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 172.30.8.65-172.30.8.75 + vlan: 410 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 0 + vlan: 300 + network: 10.167.4.0 # Tagged, 'vlan 300' on wiki + ip-range: 10.167.4.10-10.167.4.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 3 + vlan: 301 + network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki + mask: 24 + private: + interface: 1 + vlan: 1000 + network: 10.1.0.0 # Tagged, not the same with 'private' on wiki + mask: 24 + public: + interface: 2 + vlan: native + network: 172.30.10.0 # Untagged, 'public' on wiki + ip-range: 172.30.10.100-172.30.10.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 172.30.10.1 + dns: + - 8.8.8.8 + - 8.8.4.4 fuel: jumphost: bridges: admin: 'pxebr' mgmt: 'br-ctl' - private: '' - public: '' + private: ~ + public: ~ network: node: # Ordered-list, index should be in sync with node index in PDF diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml new file mode 100644 index 000000000..79a5fa044 --- /dev/null +++ b/mcp/config/labs/local/idf-virtual1.yaml @@ -0,0 +1,101 @@ +############################################################################## +# 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 +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### Fuel@OPNFV sample VIRTUAL installer descriptor file ### + +idf: + version: 0.0 # Intentionally invalid to indicate this is experimental + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + 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 + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 2048 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/mcp/config/labs/local/pod1.yaml b/mcp/config/labs/local/pod1.yaml index cf60dcf72..219b2a683 100644 --- a/mcp/config/labs/local/pod1.yaml +++ b/mcp/config/labs/local/pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Mirantis Inc., 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 @@ -8,6 +8,7 @@ --- ### LF POD 2 descriptor file ### +version: 1.0 details: pod_owner: Trevor Bramwell contact: tbramwell@linuxfoundation.org @@ -16,42 +17,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/LF+POD+2 ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 172.30.8.65-172.30.8.75 - vlan: 410 - admin: - interface: 0 - vlan: native - network: 192.168.11.0 # Untagged, 'PXE/Admin' on wiki, different IP - mask: 24 - mgmt: - interface: 0 - vlan: 300 - network: 10.167.4.0 # Tagged, 'vlan 300' on wiki - mask: 24 - storage: - interface: 3 - vlan: 301 - network: 10.2.0.0 # Tagged, not the same with 'storage' on wiki - mask: 24 - private: - interface: 1 - vlan: 1000 - network: 10.1.0.0 # Tagged, not the same with 'private' on wiki - mask: 24 - public: - interface: 2 - vlan: native - network: 172.30.10.0 # Untagged, 'public' on wiki - mask: 24 - gateway: 172.30.10.1 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: pod2-jump node: @@ -68,7 +33,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 @@ -84,19 +49,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 @@ -118,19 +84,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 @@ -143,19 +109,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 @@ -168,19 +134,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 @@ -193,19 +159,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 @@ -218,16 +184,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/mcp/config/labs/local/virtual1.yaml b/mcp/config/labs/local/virtual1.yaml new file mode 100644 index 000000000..e46a2c6c9 --- /dev/null +++ b/mcp/config/labs/local/virtual1.yaml @@ -0,0 +1,127 @@ +############################################################################## +# 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 +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### Fuel@OPNFV sample VIRTUAL POD descriptor file ### +### NOTE: This is subject to change as vPDF is not yet officialy supported ### + +version: 0.0 # Intentionally invalid to indicate this is experimental +details: + pod_owner: Fuel@OPNFV + contact: Fuel@OPNFV + lab: Example Lab + location: Example Location + type: development + link: https://wiki.opnfv.org/display/pharos/ +############################################################################## +jumphost: + name: virtual1-jump + node: + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: 15000 + os: ubuntu-16.04 + remote_management: + type: ipmi + versions: + - 1.0 + - 2.0 + user: changeme + pass: changeme + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + arch: x86_64 + cpus: 1 + cpu_cflags: ivybridge + cores: 8 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: 15000 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 127.0.0.1 # Not used currently, will be 'qemu:///system' later + interfaces: &interfaces + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces |