From cb6d651d5808854ddc7aca7a911ca950867de174 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 13 Jan 2018 23:03:43 +0100 Subject: [PATCH] [PDF] lf-pod*: Fix spec deviations - disk_rotation: 0 for SSD drives; - add 'name: nicN' to jumpserver & node interfaces; Change-Id: I98253c0402bf1a4080a9e34bea547a7b8f6fa60e Signed-off-by: Alexandru Avadanii --- labs/lf/pod2.yaml | 26 +++++++++++++++++++++++++- labs/lf/pod5.yaml | 20 +++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml index 3c5502cc..ab60bdb8 100644 --- a/labs/lf/pod2.yaml +++ b/labs/lf/pod2.yaml @@ -32,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 @@ -49,15 +49,19 @@ jumphost: 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' + name: 'nic4' ############################################################################## nodes: - name: pod2-node1 @@ -79,15 +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' + name: 'nic4' ############################################################################ - name: pod2-node2 node: *nodeparams @@ -100,15 +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' + name: 'nic4' ############################################################################ - name: pod2-node3 node: *nodeparams @@ -121,15 +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' + name: 'nic4' ############################################################################ - name: pod2-node4 node: *nodeparams @@ -142,15 +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' + name: 'nic4' ############################################################################ - name: pod2-node5 node: *nodeparams @@ -163,12 +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' + name: 'nic4' diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml index 9c14cc67..60ab4029 100644 --- a/labs/lf/pod5.yaml +++ b/labs/lf/pod5.yaml @@ -31,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 @@ -48,12 +48,15 @@ jumphost: 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' + name: 'nic3' nodes: - name: pod5-node1 node: *nodeparas @@ -66,12 +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' + name: 'nic3' - name: pod5-node2 node: *nodeparas disks: *disks @@ -83,12 +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' + name: 'nic3' - name: pod5-node3 node: *nodeparas disks: *disks @@ -100,12 +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' + name: 'nic3' - name: pod5-node4 node: *nodeparas disks: *disks @@ -117,12 +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' + name: 'nic3' - name: pod5-node5 node: *nodeparas disks: *disks @@ -134,9 +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' + name: 'nic3' -- 2.16.6