From 586cdb529c088f2d437fbb4df0f7b99068abd744 Mon Sep 17 00:00:00 2001 From: zhihui wu Date: Tue, 31 Oct 2017 11:31:30 +0800 Subject: update PDF and IDF files for zte-pod1 For supporting MCP deployment, update the PDF and IDF files for zte-pod1 Change-Id: I835b5b6fd864f8f6110921ac4b508996b5844216 Signed-off-by: zhihui wu --- labs/zte/idf-pod1.yaml | 44 +++++++++++++ labs/zte/pod1.yaml | 166 ++++++++++++++++++++++--------------------------- 2 files changed, 119 insertions(+), 91 deletions(-) create mode 100644 labs/zte/idf-pod1.yaml diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml new file mode 100644 index 0000000..42e5dda --- /dev/null +++ b/labs/zte/idf-pod1.yaml @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2017 ZTE, 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 +############################################################################## +--- +### ZTE POD 1 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-mgmt' + private: '' + public: 'br-external' + 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 + - 'ens4f0' + - 'ens12f0' + - 'ens12f1' + - 'ens44f0' + - 'ens44f1' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:08:00.0' + - '0000:08:00.1' + - '0000:81:00.0' + - '0000:81:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index 5720865..f790b82 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.yaml @@ -9,10 +9,46 @@ 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.101-192.168.1.105 + vlan: null + admin: + interface: 0 + vlan: native + network: 10.20.6.0 + mask: 24 + mgmt: + interface: 1 + vlan: 161 + network: 192.168.61.0 + mask: 24 + storage: + interface: 2 + vlan: 162 + network: 192.168.62.0 + mask: 24 + private: + interface: 3 + vlan: 1120 + network: 192.168.63.0 + mask: 24 + public: + interface: 4 + vlan: 163 + network: 172.60.0.0 + mask: 24 + gateway: 172.60.0.1 + dns: + - 172.10.0.1 +############################################################################## jumphost: name: pod1-jump node: - type: baremetal + type: barem vendor: ZTE model: R5300 arch: x86_64 @@ -20,7 +56,7 @@ jumphost: cpu_cflags: hasewell cores: 12 memory: 128G - disks: + disks: &disks - name: 'disk1' disk_capacity: 600G disk_type: hdd @@ -37,19 +73,23 @@ jumphost: disk_interface: sas disk_rotation: 10000 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:b3" - address: - - 10.20.6.1 - - 172.60.0.238 - - 192.168.1.238 + - mac_address: "74:4a:a4:00:91:b3" + speed: 1gb + fixed_ips: + admin: 10.20.6.1 + mgmt: 192.168.61.238 + public: 172.60.0.238 nodes: - name: pod1-node1 node: &nodeparas @@ -77,66 +117,43 @@ nodes: address: 192.168.1.101 mac_address: "74:4a:a4:00:cf:d9" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:cf:dc" speed: 1gb features: null - mac_address: "74:4a:a4:00:cf:dc" - address: 10.20.6.11/24 - vlan: 160 - - name: 'nic2' + - mac_address: "74:4a:a4:00:b0:e1" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e1" - vlan: 161 - - name: 'nic3' + - mac_address: "74:4a:a4:00:b0:e2" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e2" - vlan: 162 - - name: 'nic4' + - mac_address: "74:4a:a4:00:b0:dd" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:dd" - vlan: 1120 - - name: 'nic5' + - mac_address: "74:4a:a4:00:b0:de" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:de" - vlan: 163 - name: pod1-node2 - node: *nodeparas disks: *disks remote_management: <<: *remoteparas address: 192.168.1.102 mac_address: "74:4a:a4:00:ce:cb" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:ce:ce" speed: 1gb features: null - mac_address: "74:4a:a4:00:ce:ce" - address: 10.20.6.12/24 - vlan: 160 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:ad" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ad" - vlan: 161 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:ae" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ae" - vlan: 162 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d6:a9" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a9" - vlan: 1120 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d6:aa" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:aa" - vlan: 163 - name: pod1-node3 node: *nodeparas disks: *disks @@ -145,32 +162,21 @@ nodes: address: 192.168.1.103 mac_address: "74:4a:a4:00:cf:55" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:cf:58" speed: 1gb features: null - mac_address: "74:4a:a4:00:cf:58" - address: 10.20.6.13/24 - vlan: 160 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:ab" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ab" - vlan: 161 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:ac" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ac" - vlan: 162 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d6:af" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:af" - vlan: 1120 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d6:b0" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:b0" - vlan: 163 - name: pod1-node4 node: *nodeparas disks: *disks @@ -179,32 +185,21 @@ nodes: address: 192.168.1.104 mac_address: "74:4a:a4:00:49:81" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:49:84" speed: 1gb features: null - mac_address: "74:4a:a4:00:49:84" - address: 10.20.6.14/24 - vlan: 160 - - name: 'nic2' + - mac_address: "74:4a:a4:00:b1:a5" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:a5" - vlan: 161 - - name: 'nic3' + - mac_address: "74:4a:a4:00:b1:a6" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:a6" - vlan: 162 - - name: 'nic4' + - mac_address: "74:4a:a4:00:b1:b1" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:b1" - vlan: 1120 - - name: 'nic5' + - mac_address: "74:4a:a4:00:b1:b2" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:b2" - vlan: 163 - name: pod1-node5 node: *nodeparas disks: *disks @@ -213,29 +208,18 @@ nodes: address: 192.168.1.105 mac_address: "74:4a:a4:00:ce:bf" interfaces: - - name: 'nic1' + - mac_address: "74:4a:a4:00:ce:c2" speed: 1gb features: null - mac_address: "74:4a:a4:00:ce:c2" - address: 10.20.6.15/24 - vlan: 160 - - name: 'nic2' + - mac_address: "74:4a:a4:00:d6:8d" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:8d" - vlan: 161 - - name: 'nic3' + - mac_address: "74:4a:a4:00:d6:8e" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:8e" - vlan: 162 - - name: 'nic4' + - mac_address: "74:4a:a4:00:d6:9b" speed: 10gb features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9b" - vlan: 1120 - - name: 'nic5' + - mac_address: "74:4a:a4:00:d6:9c" speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9c" - vlan: 163 + features: dpdk|sriov \ No newline at end of file -- cgit 1.2.3-korg