diff options
Diffstat (limited to 'labs/zte/pod2.yaml')
-rw-r--r-- | labs/zte/pod2.yaml | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index 5b3915fe..e5dd5e67 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -1,7 +1,15 @@ +############################################################################## +# Copyright (c) 2018 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 2 descriptor file ### # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +version: 1.0 details: pod_owner: Alex Yang contact: yangyang1@zte.com.cn @@ -10,41 +18,6 @@ details: 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: @@ -61,7 +34,7 @@ jumphost: disk_capacity: 600G disk_type: hdd disk_interface: sas - disk_rotation: 10500 + disk_rotation: 10000 - name: 'disk2' disk_capacity: 4000G disk_type: hdd @@ -100,14 +73,14 @@ jumphost: 2+PxgBC5OzeXar0HSyATMD/Z7K0x] remote_management: <<: *remote_params - address: - mac_address: + # Not used, fill in with dummy values + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" interfaces: - mac_address: "74:4a:a4:00:91:18" speed: 1gb - fixed_ips: - admin: 10.20.7.1 - public: 172.70.0.239 + address: 10.20.7.1 + name: 'nic1' nodes: - name: pod2-node1 node: &nodeparas @@ -138,18 +111,23 @@ nodes: - mac_address: "74:4a:a4:00:cd:72" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b0:e9" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b0:ea" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b0:eb" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b0:ec" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node2 node: *nodeparas disks: *disks @@ -161,18 +139,23 @@ nodes: - mac_address: "74:4a:a4:00:ca:cc" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:a3" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:a4" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:99" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:9a" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node3 node: *nodeparas disks: *disks @@ -184,18 +167,23 @@ nodes: - mac_address: "74:4a:a4:00:cd:12" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:9d" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:9e" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d3:15" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d3:16" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node4 node: *nodeparas disks: *disks @@ -207,18 +195,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:40" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:a5" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:a6" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:a7" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:a8" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node5 node: *nodeparas disks: *disks @@ -230,15 +223,20 @@ nodes: - mac_address: "74:4a:a4:00:ce:d4" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d2:c3" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d2:c4" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d2:c1" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d2:c2" speed: 10gb features: dpdk|sriov + name: 'nic5' |