diff options
Diffstat (limited to 'labs/zte/pod1.yaml')
-rw-r--r-- | labs/zte/pod1.yaml | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index 950c2d89..9a4a8a02 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.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 1 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.101-192.168.1.105 - vlan: null - admin: - interface: 0 - vlan: native - network: 10.10.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: @@ -99,15 +72,14 @@ jumphost: 4IoqgBAYdFlBw90sTOBqrhoHmRbr] 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:b3" speed: 1gb - fixed_ips: - admin: 10.20.6.1 - mgmt: 192.168.61.238 - public: 172.60.0.238 + address: 10.20.6.1 + name: 'nic1' nodes: - name: pod1-node1 node: &nodeparas @@ -138,18 +110,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:dc" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b0:e1" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b0:e2" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b0:dd" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b0:de" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node2 node: *nodeparas disks: *disks @@ -161,18 +138,23 @@ nodes: - mac_address: "74:4a:a4:00:ce:ce" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:ad" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:ae" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:a9" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:aa" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node3 node: *nodeparas disks: *disks @@ -184,18 +166,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:58" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:ab" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:ac" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:af" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:b0" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node4 node: *nodeparas disks: *disks @@ -207,18 +194,23 @@ nodes: - mac_address: "74:4a:a4:00:49:84" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b1:a5" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b1:a6" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b1:b1" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b1:b2" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node5 node: *nodeparas disks: *disks @@ -230,15 +222,20 @@ nodes: - mac_address: "74:4a:a4:00:ce:c2" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:8d" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:8e" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:9b" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:9c" speed: 10gb features: dpdk|sriov + name: 'nic5' |