diff options
| -rw-r--r-- | labs/ericsson/pod1.yaml | 102 | ||||
| -rw-r--r-- | labs/ericsson/pod2.yaml | 104 | ||||
| -rw-r--r-- | labs/lf/pod4.yaml | 12 | ||||
| -rw-r--r-- | labs/zte/pod2.yaml | 3 | ||||
| -rw-r--r-- | labs/zte/pod3.yaml | 4 |
5 files changed, 45 insertions, 180 deletions
diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml index c04480c..3caa477 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -1,3 +1,4 @@ +--- ### POD descriptor file ### details: @@ -7,10 +8,10 @@ details: location: Rosersberg, Sweden type: production link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1 - +############################################################################## jumphost: name: CI-POD1-HOST - node: + node: &nodeparams type: baremetal vendor: HP model: ProLiant BL460c Gen8 @@ -19,7 +20,7 @@ jumphost: cpu_cflags: ivybridge cores: 10 memory: 64G - disks: + disks: &disks - name: 'disk1' disk_capacity: 800G disk_type: hdd @@ -62,24 +63,11 @@ jumphost: address: mac_address: "38:ea:a7:8f:06:01" vlan: native +############################################################################## nodes: - name: CI-ERICSSON-POD1-NODE1 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen8 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 800G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.16/24 @@ -105,23 +93,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "38:ea:a7:17:6b:85" + ############################################################################ - name: CI-ERICSSON-POD1-NODE2 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen8 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 800G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.17/24 @@ -147,23 +122,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "38:ea:a7:17:6b:6d" + ############################################################################ - name: CI-ERICSSON-POD1-NODE3 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen8 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 800G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.18/24 @@ -189,23 +151,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "38:ea:a7:17:6a:3d" + ############################################################################ - name: CI-ERICSSON-POD1-NODE4 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen8 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 800G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.19/24 @@ -231,23 +180,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "38:ea:a7:8f:52:cd" + ############################################################################ - name: CI-ERICSSON-POD1-NODE5 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen8 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 800G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.20/24 diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index 2145407..03ed137 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -1,3 +1,4 @@ +--- ### POD descriptor file ### details: @@ -7,10 +8,10 @@ details: location: Rosersberg, Sweden type: production link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD2 - +############################################################################## jumphost: name: CI-POD2-HOST - node: + node: &nodeparams type: baremetal vendor: HP model: ProLiant BL460c Gen9 @@ -19,7 +20,7 @@ jumphost: cpu_cflags: haswell cores: 12 memory: 128G - disks: + disks: &disks - name: 'disk1' disk_capacity: 1200G disk_type: hdd @@ -62,24 +63,11 @@ jumphost: address: 172.16.0.248/16 mac_address: "5c:b9:01:8b:9f:ed" vlan: native +############################################################################## nodes: - name: CI-ERICSSON-POD2-NODE1 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.2.12/24 @@ -105,23 +93,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "5c:b9:01:8b:a6:81" + ############################################################################ - name: CI-ERICSSON-POD2-NODE2 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.2.13/24 @@ -146,24 +121,11 @@ nodes: speed: 10gb features: 'dpdk,sriov' address: - mac_address: "5c:b9:01:8b:99:65" #second port, no connection + mac_address: "5c:b9:01:8b:99:65" # second port, no connection + ############################################################################ - name: CI-ERICSSON-POD2-NODE3 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.2.14/24 @@ -189,23 +151,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "5c:b9:01:8b:9d:6d" + ############################################################################ - name: CI-ERICSSON-POD2-NODE4 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.2.15/24 @@ -231,23 +180,10 @@ nodes: features: 'dpdk,sriov' address: mac_address: "5c:b9:01:8b:a6:09" + ############################################################################ - name: CI-ERICSSON-POD2-NODE5 - node: - type: baremetal - vendor: HP - model: ProLiant BL460c Gen9 - arch: x86_64 - cpus: 2 - cpu_cflags: haswell - cores: 12 - memory: 128G - disks: # for nodes in the same pod may have the same configuration - - name: 'disk1' - disk_capacity: 1200G - disk_type: hdd - disk_interface: scsi - disk_rotation: 15000 - os: + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.2.16/24 diff --git a/labs/lf/pod4.yaml b/labs/lf/pod4.yaml index fa8a866..04655ff 100644 --- a/labs/lf/pod4.yaml +++ b/labs/lf/pod4.yaml @@ -44,7 +44,7 @@ net_config: ############################################################################## jumphost: name: lfpod4-jumpserver - node: + node: &nodeparams type: baremetal vendor: Intel model: E5-2699 @@ -81,15 +81,7 @@ jumphost: ############################################################################## nodes: - name: lfpod4-node1 - node: &nodeparams - type: baremetal - vendor: Intel - model: E5-2699 - arch: x86_64 - cpus: 4 - cpu_cflags: hasewell - cores: 22 - memory: 64G + node: *nodeparams disks: *disks remote_management: <<: *remote_params diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index 7f3f7cb..356b798 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -1,5 +1,6 @@ +--- ### ZTE POD 2 descriptor file ### -#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml details: pod_owner: Alex Yang diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml index 37c5ff6..08e12d5 100644 --- a/labs/zte/pod3.yaml +++ b/labs/zte/pod3.yaml @@ -1,5 +1,6 @@ +--- ### ZTE POD e descriptor file ### -#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml details: pod_owner: Alex Yang @@ -214,4 +215,3 @@ nodes: features: dpdk|sriov mac_address: "74:4a:a4:00:5c:70" vlan: 103, 1020 - |