From f8dc7cd02632afbbab9e5a39bcd138a6d5341fba Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Mon, 20 Nov 2017 14:26:25 +0800 Subject: Update IDF and PDF for zte pods 1. Add IDF of zte pod2 and pod3 2. Update PDF of zte pod2 and pod3 3. Update pod config template for yaml-lint Change-Id: I30f644009ab270f929fe3ee41171986a0e0bde63 Signed-off-by: Alex Yang --- labs/zte/pod2.yaml | 182 +++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 97 deletions(-) (limited to 'labs/zte/pod2.yaml') diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index 356b798..c1e4aef 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -9,7 +9,42 @@ details: location: Shanghai, China type: production link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab - +############################################################################## +net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 192.168.1.106-192.168.1.110 + vlan: null + admin: + interface: 0 + vlan: native + network: 10.20.7.0 + mask: 24 + mgmt: + interface: 1 + vlan: 171 + network: 192.168.71.0 + mask: 24 + storage: + interface: 2 + vlan: 172 + network: 192.168.72.0 + mask: 24 + private: + interface: 3 + vlan: 1170 + network: 192.168.73.0 + mask: 24 + public: + interface: 4 + vlan: 173 + network: 172.70.0.0 + mask: 24 + gateway: 172.70.0.1 + dns: + - 172.10.0.1 +############################################################################## jumphost: name: pod2-jump node: @@ -18,35 +53,43 @@ jumphost: model: R5300 arch: x86_64 cpus: 2 - cpu_cflags: sandybridge - cores: 6 + cpu_cflags: hasewell + cores: 12 memory: 128G disks: - name: 'disk1' disk_capacity: 600G disk_type: hdd disk_interface: sas - disk_rotation: 10000 + disk_rotation: 10500 - name: 'disk2' disk_capacity: 4000G disk_type: hdd disk_interface: sata - disk_rotation: 15000 + disk_rotation: 7200 + - name: 'disk3' + disk_capacity: 4000G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 os: CentOS-7 - remote_params: &remoteparas + remote_params: &remote_params type: ipmi versions: - 2.0 user: zteroot pass: superuser + remote_management: + <<: *remote_params + address: + mac_address: interfaces: - - nic: 'nic1' - mac_address: "74:4a:a4:00:91:18" - address: - - 10.20.7.1 - - 172.70.0.239 - - 192.168.1.239 + - mac_address: "74:4a:a4:00:91:18" + speed: 1gb + fixed_ips: + admin: 10.20.7.1 + public: 172.70.0.239 nodes: - name: pod2-node1 node: &nodeparas @@ -70,169 +113,114 @@ nodes: disk_interface: sas disk_rotation: 10000 remote_management: - <<: *remoteparas + <<: *remote_params address: 192.168.1.106 mac_address: "74:4a:a4:00:cd:6f" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:cd:72" speed: 1gb features: null - mac_address: "74:4a:a4:00:cd:72" - address: 10.20.7.11/24 - vlan: 170 - - name: 'nic2' + - mac_address: "74:4a:a4:00:b0:e9" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e9" - vlan: 171 - - name: 'nic3' + - mac_address: "74:4a:a4:00:b0:ea" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:ea" - vlan: 172 - - name: 'nic4' + - mac_address: "74:4a:a4:00:b0:eb" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:eb" - vlan: 1130 - - name: 'nic5' + - mac_address: "74:4a:a4:00:b0:ec" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:ec" - vlan: 173 - name: pod2-node2 node: *nodeparas disks: *disks remote_management: - <<: *remoteparas + <<: *remote_params address: 192.168.1.107 mac_address: "74:4a:a4:00:ca:c9" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:ca:cc" speed: 1gb features: null - mac_address: "74:4a:a4:00:ca:cc" - address: 10.20.7.12/24 - vlan: 170 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:a3" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a3" - vlan: 171 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:a4" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a4" - vlan: 172 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d6:99" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:99" - vlan: 1130 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d6:9a" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9a" - vlan: 173 - name: pod2-node3 node: *nodeparas disks: *disks remote_management: - <<: *remoteparas + <<: *remote_params address: 192.168.1.108 mac_address: "74:4a:a4:00:cd:0f" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:cd:12" speed: 1gb features: null - mac_address: "74:4a:a4:00:cd:12" - address: 10.20.7.13/24 - vlan: 170 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:9d" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9d" - vlan: 171 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:9e" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9e" - vlan: 172 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d3:15" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d3:15" - vlan: 1130 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d3:16" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d3:16" - vlan: 173 - name: pod2-node4 node: *nodeparas disks: *disks remote_management: - <<: *remoteparas + <<: *remote_params address: 192.168.1.109 mac_address: "74:4a:a4:00:cf:3d" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:cf:40" speed: 1gb features: null - mac_address: "74:4a:a4:00:cf:40" - address: 10.20.7.14/24 - vlan: 170 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:a5" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a5" - vlan: 171 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:a6" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a6" - vlan: 172 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d6:a7" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a7" - vlan: 1130 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d6:a8" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a8" - vlan: 173 - name: pod2-node5 node: *nodeparas disks: *disks remote_management: - <<: *remoteparas + <<: *remote_params address: 192.168.1.110 mac_address: "74:4a:a4:00:ce:d1" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:ce:d4" speed: 1gb features: null - mac_address: "74:4a:a4:00:ce:d4" - address: 10.20.7.15/24 - vlan: 170 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d2:c3" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c3" - vlan: 171 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d2:c4" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c4" - vlan: 172 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d2:c1" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c1" - vlan: 1130 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d2:c2" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c2" - vlan: 173 -- cgit 1.2.3-korg