From e3a14b510778a4562875600f7b393b27c1dc8eba Mon Sep 17 00:00:00 2001 From: agardner Date: Thu, 4 May 2017 11:36:05 -0400 Subject: Hello, OPNFV installer projects Firstly, this patchset looks a bit messy at the onset. relevant parts are installers/apex/*.j2 installers/joid/*.j2 installers/compass4nfv/*.j2 and the new verify job that runs check-jinja2.sh If you look at installers/*/pod_config.yaml.j2 you will see the network settings for apex joid and compass4nfv installers, the possible to template hard coded values have been replaced with jinja2 vales, that are populated by reading one of labs/*/*/config/pod.yaml eg: nodes: - name: pod1-node1 becomes - name: {{ conf['nodes'][0]['name'] }} In my last patchset I had ignored data already present in the pod.yaml (which is defined in the pharos spec here: https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git;a=blob;f=config/pod1.yaml ) I created by own yaml file in an attempt to figure out what all the installers needed to know to install on any given pod. this was counter productive. I have included a script (securedlab/check-jinja2.sh) that will check all securedlab/installers/*/pod_config.yaml.j2 against all securedlab/labs/*/pod*.yaml This is a first step towards having your installers run on any pod that has a pod file created for it. (securedlab/labs/*/pod[pod-number].yaml) Moving forward I would like your input on identifing variables in your installers configs that are needed for deployment but not covered by securedlab/labs/*/pod*.yaml Thanks for your time and feedback Best Regards, Aric Change-Id: I5f2f2b403f219a1ec4b35e46a5bc49037a0a89cf Signed-off-by: agardner --- labs/zte/pod1.yaml | 241 +++++++++++++++++++++++++++++++++++++++++ labs/zte/pod1/config/pod.yaml | 242 ------------------------------------------ labs/zte/pod2.yaml | 237 +++++++++++++++++++++++++++++++++++++++++ labs/zte/pod2/config/pod.yaml | 238 ----------------------------------------- labs/zte/pod3.yaml | 217 +++++++++++++++++++++++++++++++++++++ labs/zte/pod3/config/pod.yaml | 216 ------------------------------------- 6 files changed, 695 insertions(+), 696 deletions(-) create mode 100644 labs/zte/pod1.yaml delete mode 100644 labs/zte/pod1/config/pod.yaml create mode 100644 labs/zte/pod2.yaml delete mode 100644 labs/zte/pod2/config/pod.yaml create mode 100644 labs/zte/pod3.yaml delete mode 100644 labs/zte/pod3/config/pod.yaml (limited to 'labs/zte') diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml new file mode 100644 index 0000000..cfd406c --- /dev/null +++ b/labs/zte/pod1.yaml @@ -0,0 +1,241 @@ +--- +### ZTE POD 1 descriptor file ### +# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml + +details: + pod owner: Alex Yang + contact: yangyang1@zte.com.cn + lab: ZTE Pharos Lab + location: Shanghai, China + type: production + link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab +jumphost: + name: pod1-jump + node: + type: baremetal + vendor: ZTE + model: R5300 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell + cores: 12 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk3' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + os: CentOS-7 + remote_para: &remoteparas + type: ipmi + versions: + - 2.0 + user: zteroot + pass: superuser + interfaces: + - nic: 'nic1' + mac_address: "74:4a:a4:00:91:b3" + address: + - 10.20.6.1 + - 172.60.0.238 + - 192.168.1.238 +nodes: + - name: pod1-node1 + node: &nodeparas + type: baremetal + vendor: ZTE + model: E9000 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell + cores: 10 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + remote_mangement: + <<: *remoteparas + address: 192.168.1.101 + mac_address: "74:4a:a4:00:cf:d9" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:cf:dc" + address: 10.20.6.11/24 + vlan: 160 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:e1" + vlan: 161 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:e2" + vlan: 162 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:dd" + vlan: 1120 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:de" + vlan: 163 + - name: pod1-node2 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.102 + mac_address: "74:4a:a4:00:ce:cb" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:ce:ce" + address: 10.20.6.12/24 + vlan: 160 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:ad" + vlan: 161 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:ae" + vlan: 162 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a9" + vlan: 1120 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:aa" + vlan: 163 + - name: pod1-node3 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.103 + mac_address: "74:4a:a4:00:cf:55" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:cf:58" + address: 10.20.6.13/24 + vlan: 160 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:ab" + vlan: 161 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:ac" + vlan: 162 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:af" + vlan: 1120 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:b0" + vlan: 163 + - name: pod1-node4 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.104 + mac_address: "74:4a:a4:00:49:81" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:49:84" + address: 10.20.6.14/24 + vlan: 160 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b1:a5" + vlan: 161 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b1:a6" + vlan: 162 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b1:b1" + vlan: 1120 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b1:b2" + vlan: 163 + - name: pod1-node5 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.105 + mac_address: "74:4a:a4:00:ce:bf" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:ce:c2" + address: 10.20.6.15/24 + vlan: 160 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:8d" + vlan: 161 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:8e" + vlan: 162 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:9b" + vlan: 1120 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:9c" + vlan: 163 diff --git a/labs/zte/pod1/config/pod.yaml b/labs/zte/pod1/config/pod.yaml deleted file mode 100644 index e7b5661..0000000 --- a/labs/zte/pod1/config/pod.yaml +++ /dev/null @@ -1,242 +0,0 @@ -### ZTE POD 1 descriptor file ### -#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml - -details: - pod owner: Alex Yang - contact: yangyang1@zte.com.cn - lab: ZTE Pharos Lab - location: Shanghai, China - type: production - link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab - -jumphost: - name: pod1-jump - node: - type: baremetal - vendor: ZTE - model: R5300 - arch: x86_64 - cpus: 2 - cpu_cflags: hasewell - cores: 12 - memory: 128G - disks: - - name: 'disk1' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk3' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - os: CentOS-7 - remote_para: &remoteparas - type: ipmi - - ipmi: - - 2.0 - user: zteroot - pass: superuser - interfaces: - - nic: 'nic1' - mac_address: "74:4a:a4:00:91:b3" - address: - - 10.20.6.1 - - 172.60.0.238 - - 192.168.1.238 -nodes: - - name: pod1-node1 - node: &nodeparas - type: baremetal - vendor: ZTE - model: E9000 - arch: x86_64 - cpus: 2 - cpu_cflags: hasewell - cores: 10 - memory: 128G - disks: &disks - - name: 'disk1' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - remote_mangement: - <<: *remoteparas - address: 192.168.1.101 - mac_address: "74:4a:a4:00:cf:d9" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:cf:dc" - address: 10.20.6.11/24 - vlan: 160 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e1" - vlan: 161 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e2" - vlan: 162 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:dd" - vlan: 1120 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:de" - vlan: 163 - - name: pod1-node2 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.102 - mac_address: "74:4a:a4:00:ce:cb" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:ce:ce" - address: 10.20.6.12/24 - vlan: 160 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ad" - vlan: 161 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ae" - vlan: 162 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a9" - vlan: 1120 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:aa" - vlan: 163 - - name: pod1-node3 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.103 - mac_address: "74:4a:a4:00:cf:55" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:cf:58" - address: 10.20.6.13/24 - vlan: 160 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ab" - vlan: 161 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:ac" - vlan: 162 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:af" - vlan: 1120 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:b0" - vlan: 163 - - name: pod1-node4 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.104 - mac_address: "74:4a:a4:00:49:81" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:49:84" - address: 10.20.6.14/24 - vlan: 160 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:a5" - vlan: 161 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:a6" - vlan: 162 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:b1" - vlan: 1120 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b1:b2" - vlan: 163 - - name: pod1-node5 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.103 - mac_address: "74:4a:a4:00:ce:bf" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:ce:c2" - address: 10.20.6.15/24 - vlan: 160 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:8d" - vlan: 161 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:8e" - vlan: 162 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9b" - vlan: 1120 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9c" - vlan: 163 - diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml new file mode 100644 index 0000000..4945f99 --- /dev/null +++ b/labs/zte/pod2.yaml @@ -0,0 +1,237 @@ +### ZTE POD 2 descriptor file ### +#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml + +details: + pod owner: Alex Yang + contact: yangyang1@zte.com.cn + lab: ZTE Pharos Lab + location: Shanghai, China + type: production + link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab + +jumphost: + name: pod2-jump + node: + type: baremetal + vendor: ZTE + model: R5300 + arch: x86_64 + cpus: 2 + cpu_cflags: sandybridge + cores: 6 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 4000G + disk_type: hdd + disk_interface: sata + disk_rotation: 15000 + + os: CentOS-7 + remote_para: &remoteparas + type: ipmi + versions: + - 2.0 + user: zteroot + pass: superuser + interfaces: + - nic: 'nic1' + mac_address: "74:4a:a4:00:91:18" + address: + - 10.20.7.1 + - 172.70.0.239 + - 192.168.1.239 +nodes: + - name: pod2-node1 + node: &nodeparas + type: baremetal + vendor: ZTE + model: E9000 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell + cores: 10 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + remote_mangement: + <<: *remoteparas + address: 192.168.1.106 + mac_address: "74:4a:a4:00:cd:6f" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:cd:72" + address: 10.20.7.11/24 + vlan: 170 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:e9" + vlan: 171 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:ea" + vlan: 172 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:eb" + vlan: 1130 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:b0:ec" + vlan: 173 + - name: pod2-node2 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.107 + mac_address: "74:4a:a4:00:ca:c9" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:ca:cc" + address: 10.20.7.12/24 + vlan: 170 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a3" + vlan: 171 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a4" + vlan: 172 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:99" + vlan: 1130 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:9a" + vlan: 173 + - name: pod2-node3 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.108 + mac_address: "74:4a:a4:00:cd:0f" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:cd:12" + address: 10.20.7.13/24 + vlan: 170 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:9d" + vlan: 171 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:9e" + vlan: 172 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d3:15" + vlan: 1130 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d3:16" + vlan: 173 + - name: pod2-node4 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.109 + mac_address: "74:4a:a4:00:cf:3d" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:cf:40" + address: 10.20.7.14/24 + vlan: 170 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a5" + vlan: 171 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a6" + vlan: 172 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a7" + vlan: 1130 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d6:a8" + vlan: 173 + - name: pod2-node5 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.110 + mac_address: "74:4a:a4:00:ce:d1" + interfaces: + - name: 'nic1' + speed: 1gb + features: null + mac_address: "74:4a:a4:00:ce:d4" + address: 10.20.7.15/24 + vlan: 170 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d2:c3" + vlan: 171 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d2:c4" + vlan: 172 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d2:c1" + vlan: 1130 + - name: 'nic5' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:d2:c2" + vlan: 173 diff --git a/labs/zte/pod2/config/pod.yaml b/labs/zte/pod2/config/pod.yaml deleted file mode 100644 index b2219f9..0000000 --- a/labs/zte/pod2/config/pod.yaml +++ /dev/null @@ -1,238 +0,0 @@ -### ZTE POD 2 descriptor file ### -#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml - -details: - pod owner: Alex Yang - contact: yangyang1@zte.com.cn - lab: ZTE Pharos Lab - location: Shanghai, China - type: production - link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab - -jumphost: - name: pod2-jump - node: - type: baremetal - vendor: ZTE - model: R5300 - arch: x86_64 - cpus: 2 - cpu_cflags: sandybridge - cores: 6 - memory: 128G - disks: - - name: 'disk1' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 4000G - disk_type: hdd - disk_interface: sata - disk_rotation: 15000 - - os: CentOS-7 - remote_para: &remoteparas - type: ipmi - - ipmi: - - 2.0 - user: zteroot - pass: superuser - interfaces: - - nic: 'nic1' - mac_address: "74:4a:a4:00:91:18" - address: - - 10.20.7.1 - - 172.70.0.239 - - 192.168.1.239 -nodes: - - name: pod2-node1 - node: &nodeparas - type: baremetal - vendor: ZTE - model: E9000 - arch: x86_64 - cpus: 2 - cpu_cflags: hasewell - cores: 10 - memory: 128G - disks: &disks - - name: 'disk1' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - remote_mangement: - <<: *remoteparas - address: 192.168.1.106 - mac_address: "74:4a:a4:00:cd:6f" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:cd:72" - address: 10.20.7.11/24 - vlan: 170 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:e9" - vlan: 171 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:ea" - vlan: 172 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:eb" - vlan: 1130 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:b0:ec" - vlan: 173 - - name: pod2-node2 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.107 - mac_address: "74:4a:a4:00:ca:c9" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:ca:cc" - address: 10.20.7.12/24 - vlan: 170 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a3" - vlan: 171 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a4" - vlan: 172 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:99" - vlan: 1130 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9a" - vlan: 173 - - name: pod2-node3 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.108 - mac_address: "74:4a:a4:00:cd:0f" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:cd:12" - address: 10.20.7.13/24 - vlan: 170 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9d" - vlan: 171 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:9e" - vlan: 172 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d3:15" - vlan: 1130 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d3:16" - vlan: 173 - - name: pod2-node4 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.109 - mac_address: "74:4a:a4:00:cf:3d" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:cf:40" - address: 10.20.7.14/24 - vlan: 170 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a5" - vlan: 171 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a6" - vlan: 172 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a7" - vlan: 1130 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d6:a8" - vlan: 173 - - name: pod2-node5 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.110 - mac_address: "74:4a:a4:00:ce:d1" - interfaces: - - name: 'nic1' - speed: 1gb - features: null - mac_address: "74:4a:a4:00:ce:d4" - address: 10.20.7.15/24 - vlan: 170 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c3" - vlan: 171 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c4" - vlan: 172 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c1" - vlan: 1130 - - name: 'nic5' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:d2:c2" - vlan: 173 - diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml new file mode 100644 index 0000000..a17afaf --- /dev/null +++ b/labs/zte/pod3.yaml @@ -0,0 +1,217 @@ +### ZTE POD e descriptor file ### +#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml + +details: + pod owner: Alex Yang + contact: yangyang1@zte.com.cn + lab: ZTE Pharos Lab + location: Shanghai, China + type: production + link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab + +jumphost: + name: pod3-jump + node: + type: baremetal + vendor: ZTE + model: R5300 + arch: x86_64 + cpus: 1 + cpu_cflags: ivybridge + cores: 6 + memory: 32G + disks: + - name: 'disk1' + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk3' + disk_capacity: 1200G + disk_type: hdd + disk_interface: iscsi + disk_rotation: 10000 + os: CentOS-7 + remote_para: &remoteparas + type: ipmi + versions: + - 2.0 + user: zteroot + pass: superuser + interfaces: + - nic: 'nic1' + mac_address: "74:4a:a4:00:21:0c" + address: + - 10.20.0.1 + - 172.10.0.240 + - 192.168.1.4 +nodes: + - name: pod3-node1 + node: &nodeparas + type: baremetal + vendor: ZTE + model: E9000 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: &disks + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + remote_mangement: + <<: *remoteparas + address: 192.168.1.32 + mac_address: "0c:12:62:e4:bf:de" + interfaces: + - name: 'nic1' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:0b:85" + address: 10.20.0.11/24 + vlan: 100 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:0b:86" + vlan: 101 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:0b:87" + vlan: 102 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:0b:88" + vlan: 103, 1020 + - name: pod3-node2 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.33 + mac_address: "00:12:62:e4:c0:33" + interfaces: + - name: 'nic1' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:5d" + address: 10.20.0.12/24 + vlan: 100 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:5e" + vlan: 101 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:5f" + vlan: 102 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:60" + vlan: 103, 1020 + - name: pod3-node3 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.34 + mac_address: "74:4a:a4:00:30:93" + interfaces: + - name: 'nic1' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:35" + address: 10.20.0.13/24 + vlan: 100 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:36" + vlan: 101 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:37" + vlan: 102 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:38" + vlan: 103, 1020 + - name: pod3-node4 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.35 + mac_address: "00:12:62:e4:c0:42" + interfaces: + - name: 'nic1' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:69" + address: 10.20.0.14/24 + vlan: 100 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6a" + vlan: 101 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6b" + vlan: 102 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6c" + vlan: 103, 1020 + - name: pod3-node5 + node: *nodeparas + disks: *disks + remote_mangement: + <<: *remoteparas + address: 192.168.1.36 + mac_address: "74:4a:a4:00:30:43" + interfaces: + - name: 'nic1' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6d" + address: 10.20.0.15/24 + vlan: 100 + - name: 'nic2' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6e" + vlan: 101 + - name: 'nic3' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:6f" + vlan: 102 + - name: 'nic4' + speed: 10gb + features: dpdk|sriov + mac_address: "74:4a:a4:00:5c:70" + vlan: 103, 1020 + diff --git a/labs/zte/pod3/config/pod.yaml b/labs/zte/pod3/config/pod.yaml deleted file mode 100644 index df3bbe0..0000000 --- a/labs/zte/pod3/config/pod.yaml +++ /dev/null @@ -1,216 +0,0 @@ -### ZTE POD e descriptor file ### -#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml - -details: - pod owner: Alex Yang - contact: yangyang1@zte.com.cn - lab: ZTE Pharos Lab - location: Shanghai, China - type: production - link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab - -jumphost: - name: pod3-jump - node: - type: baremetal - vendor: ZTE - model: R5300 - arch: x86_64 - cpus: 1 - cpu_cflags: ivybridge - cores: 6 - memory: 32G - disks: - - name: 'disk1' - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk3' - disk_capacity: 1200G - disk_type: hdd - disk_interface: iscsi - disk_rotation: 10000 - os: CentOS-7 - remote_para: &remoteparas - type: ipmi - - ipmi: - - 2.0 - user: zteroot - pass: superuser - interfaces: - - nic: 'nic1' - mac_address: "74:4a:a4:00:21:0c" - - 10.20.0.1 - - 172.10.0.240 - - 192.168.1.4 -nodes: - - name: pod3-node1 - node: &nodeparas - type: baremetal - vendor: ZTE - model: E9000 - arch: x86_64 - cpus: 2 - cpu_cflags: ivybridge - cores: 10 - memory: 64G - disks: &disks - - name: 'disk1' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - - name: 'disk2' - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 10000 - remote_mangement: - <<: *remoteparas - address: 192.168.1.32 - mac_address: "0c:12:62:e4:bf:de" - interfaces: - - name: 'nic1' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:0b:85" - address: 10.20.0.11/24 - vlan: 100 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:0b:86" - vlan: 101 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:0b:87" - vlan: 102 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:0b:88" - vlan: 103, 1020 - - name: pod3-node2 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.33 - mac_address: "00:12:62:e4:c0:33" - interfaces: - - name: 'nic1' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:5d" - address: 10.20.0.12/24 - vlan: 100 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:5e" - vlan: 101 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:5f" - vlan: 102 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:60" - vlan: 103, 1020 - - name: pod3-node3 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.34 - mac_address: "74:4a:a4:00:30:93" - interfaces: - - name: 'nic1' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:35" - address: 10.20.0.13/24 - vlan: 100 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:36" - vlan: 101 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:37" - vlan: 102 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:38" - vlan: 103, 1020 - - name: pod3-node4 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.35 - mac_address: "00:12:62:e4:c0:42" - interfaces: - - name: 'nic1' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:69" - address: 10.20.0.14/24 - vlan: 100 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6a" - vlan: 101 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6b" - vlan: 102 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6c" - vlan: 103, 1020 - - name: pod3-node5 - node: *nodeparas - disks: *disks - remote_mangement: - <<: *remoteparas - address: 192.168.1.36 - mac_address: "74:4a:a4:00:30:43" - interfaces: - - name: 'nic1' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6d" - address: 10.20.0.15/24 - vlan: 100 - - name: 'nic2' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6e" - vlan: 101 - - name: 'nic3' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:6f" - vlan: 102 - - name: 'nic4' - speed: 10gb - features: dpdk|sriov - mac_address: "74:4a:a4:00:5c:70" - vlan: 103, 1020 - -- cgit