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/pod3.yaml | 217 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 217 insertions(+) create mode 100644 labs/zte/pod3.yaml (limited to 'labs/zte/pod3.yaml') 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 + -- cgit 1.2.3-korg