From: agardner Date: Fri, 1 Dec 2017 21:46:35 +0000 (-0500) Subject: Moving all pdfs to pharos repo X-Git-Tag: 6.0.0~65^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b0617530e5b00ae85a1b3d00519afbd942a53539;p=pharos.git Moving all pdfs to pharos repo Note: Also fixed yamllint issues with these files Inline encrytion of yaml files allows us to make away with securedlab's restrictions. Going forward, anyone will be able to see Lab PDFs See: https://github.com/opnfv/pharos/blob/master/config/utils/README.eyaml.rst If you are the reviewer on this changeset it is becasue git blamed showed you to be the author of the pdf in this review. Encrypting ipmi password etc is optional. I have scrubbed the password from this change. If you do not need the password to be hidden, please let me know in the comment, and I will put it back. If you do need the password hidden, please follow the readme above and ammend this patch to include the encrypted value that you create on your pods jumphost. Passwords and Usernames removed: $ egrep -r '(pass|user)' zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml: ipmi_user: zte/pod2/daisy/config/deploy.yml: ipmi_pass: zte/pod2/daisy/config/deploy.yml:daisy_passwd: '' zte/virtual1/daisy/config/deploy.yml:daisy_passwd: '' zte/pod3.yaml: user: zte/pod3.yaml: pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml: ipmi_user: zte/pod3/daisy/config/deploy.yml: ipmi_pass: zte/pod3/daisy/config/deploy.yml:daisy_passwd: '' zte/pod1.yaml: user: zte/pod1.yaml: pass: zte/virtual2/daisy/config/deploy.yml:daisy_passwd: '' zte/pod2.yaml: user: zte/pod2.yaml: pass: lf/pod2.yaml: user: > Change-Id: I876f4b553c51dd4592701539cfce66bcf8c114ab Signed-off-by: agardner --- diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml new file mode 100644 index 00000000..42e5dda0 --- /dev/null +++ b/labs/zte/idf-pod1.yaml @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2017 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 installer descriptor file ### + +idf: + version: 0.1 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-mgmt' + private: '' + public: 'br-external' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'ens4f0' + - 'ens12f0' + - 'ens12f1' + - 'ens44f0' + - 'ens44f1' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:08:00.0' + - '0000:08:00.1' + - '0000:81:00.0' + - '0000:81:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml new file mode 100644 index 00000000..e8d7f781 --- /dev/null +++ b/labs/zte/idf-pod2.yaml @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2017 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 installer descriptor file ### + +idf: + version: 0.1 + daisy: + jumphost: + bridges: + admin: 'br7' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'ens4f0' + - 'ens12f0' + - 'ens12f1' + - 'ens44f0' + - 'ens44f1' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:08:00.0' + - '0000:08:00.1' + - '0000:81:00.0' + - '0000:81:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml new file mode 100644 index 00000000..d1bb156e --- /dev/null +++ b/labs/zte/idf-pod3.yaml @@ -0,0 +1,39 @@ +############################################################################## +# Copyright (c) 2017 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 3 installer descriptor file ### + +idf: + version: 0.1 + daisy: + jumphost: + bridges: + admin: 'br0' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'enp2s0f0' + - 'enp2s0f1' + - 'enp132s0f0' + - 'enp132s0f1' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:02:00.0' + - '0000:02:00.1' + - '0000:84:00.0' + - '0000:84:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml new file mode 100644 index 00000000..83a59af3 --- /dev/null +++ b/labs/zte/pod1.yaml @@ -0,0 +1,226 @@ +--- +### 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 +############################################################################## +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.20.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: + 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_params: &remote_params + type: ipmi + versions: + - 2.0 + user: + pass: + remote_management: + <<: *remote_params + address: + mac_address: + 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 +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_management: + <<: *remote_params + address: 192.168.1.101 + mac_address: "74:4a:a4:00:cf:d9" + interfaces: + - mac_address: "74:4a:a4:00:cf:dc" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:b0:e1" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:e2" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:dd" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:de" + speed: 10gb + features: dpdk|sriov + - name: pod1-node2 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.102 + mac_address: "74:4a:a4:00:ce:cb" + interfaces: + - mac_address: "74:4a:a4:00:ce:ce" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:ad" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:ae" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:a9" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:aa" + speed: 10gb + features: dpdk|sriov + - name: pod1-node3 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.103 + mac_address: "74:4a:a4:00:cf:55" + interfaces: + - mac_address: "74:4a:a4:00:cf:58" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:ab" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:ac" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:af" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:b0" + speed: 10gb + features: dpdk|sriov + - name: pod1-node4 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.104 + mac_address: "74:4a:a4:00:49:81" + interfaces: + - mac_address: "74:4a:a4:00:49:84" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:b1:a5" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b1:a6" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b1:b1" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b1:b2" + speed: 10gb + features: dpdk|sriov + - name: pod1-node5 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.105 + mac_address: "74:4a:a4:00:ce:bf" + interfaces: + - mac_address: "74:4a:a4:00:ce:c2" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:8d" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:8e" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:9b" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:9c" + speed: 10gb + features: dpdk|sriov diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml new file mode 100644 index 00000000..fac1f9a7 --- /dev/null +++ b/labs/zte/pod2.yaml @@ -0,0 +1,226 @@ +--- +### 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 +############################################################################## +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: + 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: 10500 + - name: 'disk2' + disk_capacity: 4000G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk3' + disk_capacity: 4000G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + + os: CentOS-7 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: + pass: + remote_management: + <<: *remote_params + address: + mac_address: + interfaces: + - mac_address: "74:4a:a4:00:91:18" + speed: 1gb + fixed_ips: + admin: 10.20.7.1 + public: 172.70.0.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_management: + <<: *remote_params + address: 192.168.1.106 + mac_address: "74:4a:a4:00:cd:6f" + interfaces: + - mac_address: "74:4a:a4:00:cd:72" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:b0:e9" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:ea" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:eb" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:b0:ec" + speed: 10gb + features: dpdk|sriov + - name: pod2-node2 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.107 + mac_address: "74:4a:a4:00:ca:c9" + interfaces: + - mac_address: "74:4a:a4:00:ca:cc" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:a3" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:a4" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:99" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:9a" + speed: 10gb + features: dpdk|sriov + - name: pod2-node3 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.108 + mac_address: "74:4a:a4:00:cd:0f" + interfaces: + - mac_address: "74:4a:a4:00:cd:12" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:9d" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:9e" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d3:15" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d3:16" + speed: 10gb + features: dpdk|sriov + - name: pod2-node4 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.109 + mac_address: "74:4a:a4:00:cf:3d" + interfaces: + - mac_address: "74:4a:a4:00:cf:40" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d6:a5" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:a6" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:a7" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d6:a8" + speed: 10gb + features: dpdk|sriov + - name: pod2-node5 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.110 + mac_address: "74:4a:a4:00:ce:d1" + interfaces: + - mac_address: "74:4a:a4:00:ce:d4" + speed: 1gb + features: null + - mac_address: "74:4a:a4:00:d2:c3" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d2:c4" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d2:c1" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:d2:c2" + speed: 10gb + features: dpdk|sriov diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml new file mode 100644 index 00000000..5b74dade --- /dev/null +++ b/labs/zte/pod2/daisy/config/deploy.yml @@ -0,0 +1,78 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +--- +adapter: ipmi +hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.106 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:cd:72 + - 74:4a:a4:00:b0:e9 + - 74:4a:a4:00:b0:ea + - 74:4a:a4:00:b0:eb + - 74:4a:a4:00:b0:ec + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.107 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:ca:cc + - 74:4a:a4:00:d6:a3 + - 74:4a:a4:00:d6:a4 + - 74:4a:a4:00:d6:99 + - 74:4a:a4:00:d6:9a + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.108 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:cd:12 + - 74:4a:a4:00:d6:9d + - 74:4a:a4:00:d6:9e + - 74:4a:a4:00:d3:15 + - 74:4a:a4:00:d3:16 + - name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: 192.168.1.109 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:cf:40 + - 74:4a:a4:00:d6:a5 + - 74:4a:a4:00:d6:a6 + - 74:4a:a4:00:d6:a7 + - 74:4a:a4:00:d6:a8 + - name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: 192.168.1.110 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:ce:d4 + - 74:4a:a4:00:d2:c3 + - 74:4a:a4:00:d2:c4 + - 74:4a:a4:00:d2:c1 + - 74:4a:a4:00:d2:c2 +disks: + daisy: 50 +daisy_passwd: '' +daisy_ip: '10.20.7.3' +daisy_gateway: '10.20.7.1' +ceph_disk_name: '/dev/sdb' diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml new file mode 100644 index 00000000..739d1a4f --- /dev/null +++ b/labs/zte/pod2/daisy/config/network.yml @@ -0,0 +1,85 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## + +############################################################################## +# Description +# MANAGEMENT: used for PXE, vlan used +# SOTRAGE: used for storage access +# EXTERNAL: tenant public/floating IP associated network, +# requires a dedicated interface +# PUBLICAPI: used for horizon access, openstack API access +# TENANT: used for tenant access, vlan and VxLan supported, default VxLan +############################################################################## +--- +network-config-metadata: + title: 'Deployment Adapter for baremetal POD' + version: '0.1' + created: 'Feb 2 2017' + comment: 'For Daisy initial' +networks: + - cidr: '192.168.71.0/24' + gateway: '192.168.71.1' + ip_ranges: + - 'start': '192.168.71.2' + 'end': '192.168.71.254' + vlan_id: 171 + name: 'MANAGEMENT' + - cidr: '192.168.72.0/24' + gateway: '192.168.72.1' + ip_ranges: + - 'start': '192.168.72.2' + 'end': '192.168.72.254' + vlan_id: 172 + name: 'STORAGE' + - cidr: '172.70.0.0/24' + gateway: '172.70.0.1' + ip_ranges: + - 'start': '172.70.0.2' + 'end': '172.70.0.100' + vlan_id: 173 + 'name': 'EXTERNAL' + network_name: 'admin_external' + mapping: 'physnet1' + - cidr: '192.168.71.0/24' + gateway: '192.168.71.1' + ip_ranges: + - 'start': '192.168.71.2' + 'end': '192.168.71.254' + vlan_id: 171 + name: 'PUBLICAPI' + - cidr: '192.168.73.0/24' + gateway: '192.168.73.1' + ip_ranges: + - 'start': '192.168.73.2' + 'end': '192.168.73.254' + vlan_id: 1130 + name: 'TENANT' + - cidr: '10.20.7.0/24' + gateway: '10.20.7.1' + ip_ranges: + - 'start': '10.20.7.20' + 'end': '10.20.7.200' + vlan_id: null + name: 'HEARTBEAT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens44f1' + - name: 'MANAGEMENT' + interface: 'ens12f0' + - name: 'PUBLICAPI' + interface: 'ens12f0' + - name: 'STORAGE' + interface: 'ens12f1' + - name: 'TENANT' + interface: 'ens44f0' + - name: 'HEARTBEAT' + interface: 'ens4f0' +internal_vip: '192.168.71.10' +public_vip: '10.20.7.11' diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml new file mode 100644 index 00000000..c3c835b8 --- /dev/null +++ b/labs/zte/pod3.yaml @@ -0,0 +1,210 @@ +--- +### ZTE POD 3 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 +############################################################################## +net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 192.168.1.32-192.168.1.36 + vlan: null + admin: + interface: 0 + vlan: native + network: 10.20.0.0 + mask: 24 + mgmt: + interface: 1 + vlan: 101 + network: 192.168.11.0 + mask: 24 + storage: + interface: 2 + vlan: 102 + network: 192.168.12.0 + mask: 24 + private: + interface: 3 + vlan: 1030 + network: 192.168.13.0 + mask: 24 + public: + interface: 3 + vlan: 103 + network: 172.10.0.0 + mask: 24 + gateway: 172.10.0.1 + dns: + - 172.10.0.1 +############################################################################## +jumphost: + name: pod3-jump + node: + type: baremetal + vendor: ZTE + model: R5300 + arch: x86_64 + cpus: 1 + cpu_cflags: hasewell + cores: 6 + memory: 80G + 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_params: &remote_params + type: ipmi + versions: + - 2.0 + user: + pass: + remote_management: + <<: *remote_params + address: + mac_address: + interfaces: + - mac_address: "74:4a:a4:00:21:0c" + speed: 1gb + fixed_ips: + admin: 10.20.0.1 + public: 172.10.0.240 +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_management: + <<: *remote_params + address: 192.168.1.32 + mac_address: "0c:12:62:e4:bf:de" + interfaces: + - mac_address: "74:4a:a4:00:0b:85" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:0b:86" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:0b:87" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:0b:88" + speed: 10gb + features: dpdk|sriov + - name: pod3-node2 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.33 + mac_address: "00:12:62:e4:c0:33" + interfaces: + - mac_address: "74:4a:a4:00:5c:5d" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:5e" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:5f" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:60" + speed: 10gb + features: dpdk|sriov + - name: pod3-node3 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.34 + mac_address: "74:4a:a4:00:30:93" + interfaces: + - mac_address: "74:4a:a4:00:5c:35" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:36" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:37" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:38" + speed: 10gb + features: dpdk|sriov + - name: pod3-node4 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.35 + mac_address: "00:12:62:e4:c0:42" + interfaces: + - mac_address: "74:4a:a4:00:5c:69" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:6a" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:6b" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:6c" + speed: 10gb + features: dpdk|sriov + - name: pod3-node5 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.36 + mac_address: "74:4a:a4:00:30:43" + interfaces: + - mac_address: "74:4a:a4:00:5c:6d" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:6e" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:6f" + speed: 10gb + features: dpdk|sriov + - mac_address: "74:4a:a4:00:5c:70" + speed: 10gb + features: dpdk|sriov diff --git a/labs/zte/pod3/daisy/config/deploy.yml b/labs/zte/pod3/daisy/config/deploy.yml new file mode 100644 index 00000000..55c1b07e --- /dev/null +++ b/labs/zte/pod3/daisy/config/deploy.yml @@ -0,0 +1,73 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +--- +adapter: ipmi +hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.32 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:0b:85 + - 74:4a:a4:00:0b:86 + - 74:4a:a4:00:0b:87 + - 74:4a:a4:00:0b:88 + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.33 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:5c:5d + - 74:4a:a4:00:5c:5e + - 74:4a:a4:00:5c:5f + - 74:4a:a4:00:5c:60 + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: 192.168.1.34 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:5c:35 + - 74:4a:a4:00:5c:36 + - 74:4a:a4:00:5c:37 + - 74:4a:a4:00:5c:38 + - name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: 192.168.1.35 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:5c:69 + - 74:4a:a4:00:5c:6a + - 74:4a:a4:00:5c:6b + - 74:4a:a4:00:5c:6c + - name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: 192.168.1.36 + ipmi_user: + ipmi_pass: + mac_addresses: + - 74:4a:a4:00:5c:6d + - 74:4a:a4:00:5c:6e + - 74:4a:a4:00:5c:6f + - 74:4a:a4:00:5c:70 +disks: + daisy: 50 +daisy_passwd: '' +daisy_ip: '10.20.0.2' +daisy_gateway: '10.20.0.1' +ceph_disk_name: '/dev/sdb' diff --git a/labs/zte/pod3/daisy/config/network.yml b/labs/zte/pod3/daisy/config/network.yml new file mode 100644 index 00000000..b2d6696b --- /dev/null +++ b/labs/zte/pod3/daisy/config/network.yml @@ -0,0 +1,85 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## + +############################################################################## +# Description +# MANAGEMENT: used for PXE, vlan used +# SOTRAGE: used for storage access +# EXTERNAL: tenant public/floating IP associated network, +# requires a dedicated interface +# PUBLICAPI: used for horizon access, openstack API access +# TENANT: used for tenant access, vlan and VxLan supported, default VxLan +############################################################################## +--- +network-config-metadata: + title: 'Deployment Adapter for baremetal POD' + version: '0.1' + created: 'Sep 13 2017' + comment: 'For Daisy initial' +networks: + - cidr: '192.168.11.0/24' + gateway: '192.168.11.1' + ip_ranges: + - 'start': '192.168.11.2' + 'end': '192.168.11.254' + vlan_id: 101 + name: 'MANAGEMENT' + - cidr: '192.168.12.0/24' + gateway: '192.168.12.1' + ip_ranges: + - 'start': '192.168.12.2' + 'end': '192.168.12.254' + vlan_id: 102 + name: 'STORAGE' + - cidr: '172.10.0.0/24' + gateway: '172.10.0.1' + ip_ranges: + - 'start': '172.10.0.2' + 'end': '172.10.0.200' + vlan_id: 103 + 'name': 'EXTERNAL' + network_name: 'admin_external' + mapping: 'physnet1' + - cidr: '192.168.11.0/24' + gateway: '192.168.11.1' + ip_ranges: + - 'start': '192.168.11.2' + 'end': '192.168.11.254' + vlan_id: 101 + name: 'PUBLICAPI' + - cidr: '192.168.13.0/24' + gateway: '192.168.13.1' + ip_ranges: + - 'start': '192.168.13.2' + 'end': '192.168.13.254' + vlan_id: 1030 + name: 'TENANT' + - cidr: '10.20.0.0/24' + gateway: '10.20.0.1' + ip_ranges: + - 'start': '10.20.0.20' + 'end': '10.20.0.200' + vlan_id: null + name: 'HEARTBEAT' +interfaces: + - name: 'EXTERNAL' + interface: 'enp132s0f1' + - name: 'MANAGEMENT' + interface: 'enp2s0f1' + - name: 'PUBLICAPI' + interface: 'enp2s0f1' + - name: 'STORAGE' + interface: 'enp132s0f0' + - name: 'TENANT' + interface: 'enp132s0f1' + - name: 'HEARTBEAT' + interface: 'enp2s0f0' +internal_vip: '192.168.11.10' +public_vip: '10.20.0.11' diff --git a/labs/zte/virtual1/daisy/config/deploy.yml b/labs/zte/virtual1/daisy/config/deploy.yml new file mode 100644 index 00000000..49db19e8 --- /dev/null +++ b/labs/zte/virtual1/daisy/config/deploy.yml @@ -0,0 +1,32 @@ +--- +adapter: libvirt +hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' +disks: + daisy: 50 + controller: 110 + compute: 110 + ceph: 110 +daisy_passwd: '' +daisy_ip: '10.20.11.2' +daisy_gateway: '10.20.11.1' +ceph_disk_name: '/dev/sdb' diff --git a/labs/zte/virtual1/daisy/config/network.yml b/labs/zte/virtual1/daisy/config/network.yml new file mode 100644 index 00000000..35b49fef --- /dev/null +++ b/labs/zte/virtual1/daisy/config/network.yml @@ -0,0 +1,69 @@ +############################################################################## +# Copyright (c) 2016 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +--- +network-config-metadata: + title: 'zte-virtual1 network config' + version: '0.1' + created: 'Tue Apr 11 2017' + comment: 'five vm node deploy' +networks: + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'MANAGEMENT' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'STORAGE' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.1' + ip_ranges: + - start: '172.10.101.2' + end: '172.10.101.20' + name: 'EXTERNAL' + network_name: 'admin_external' + mapping: 'physnet1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'PUBLICAPI' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'TENANT' + - cidr: '100.20.11.0/24' + gateway: '100.20.11.1' + ip_ranges: + - start: '100.20.11.3' + end: '100.20.11.10' + name: 'HEARTBEAT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens8' + - name: 'MANAGEMENT' + interface: 'ens3' + - name: 'PUBLICAPI' + interface: 'ens3' + - name: 'STORAGE' + interface: 'ens3' + - name: 'TENANT' + interface: 'ens3' + - name: 'HEARTBEAT' + interface: 'ens9' +internal_vip: '10.20.11.11' +public_vip: '10.20.11.11' diff --git a/labs/zte/virtual2/daisy/config/deploy.yml b/labs/zte/virtual2/daisy/config/deploy.yml new file mode 100644 index 00000000..1f25e02c --- /dev/null +++ b/labs/zte/virtual2/daisy/config/deploy.yml @@ -0,0 +1,16 @@ +--- +adapter: libvirt +hosts: + - name: 'all_in_one' + roles: + - 'CONTROLLER_LB' + - 'COMPUTER' + template: 'templates/virtual_environment/vms/all_in_one.xml' +disks: + daisy: 50 + controller: 110 + compute: 110 +daisy_passwd: '' +daisy_ip: '10.20.11.2' +daisy_gateway: '10.20.11.1' +ceph_disk_name: '' diff --git a/labs/zte/virtual2/daisy/config/network.yml b/labs/zte/virtual2/daisy/config/network.yml new file mode 100644 index 00000000..d27fd033 --- /dev/null +++ b/labs/zte/virtual2/daisy/config/network.yml @@ -0,0 +1,69 @@ +############################################################################## +# Copyright (c) 2016 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +--- +network-config-metadata: + title: 'zte-virtual2 network config' + version: '0.1' + created: 'Tue Apr 11 2017' + comment: 'all-in-one vm node deploy' +networks: + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'MANAGEMENT' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'STORAGE' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.1' + ip_ranges: + - start: '172.10.101.2' + end: '172.10.101.20' + name: 'EXTERNAL' + network_name: 'admin_external' + mapping: 'physnet1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'PUBLICAPI' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' + ip_ranges: + - start: '10.20.11.3' + end: '10.20.11.10' + name: 'TENANT' + - cidr: '100.20.11.0/24' + gateway: '100.20.11.1' + ip_ranges: + - start: '100.20.11.3' + end: '100.20.11.10' + name: 'HEARTBEAT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens8' + - name: 'MANAGEMENT' + interface: 'ens3' + - name: 'PUBLICAPI' + interface: 'ens3' + - name: 'STORAGE' + interface: 'ens3' + - name: 'TENANT' + interface: 'ens3' + - name: 'HEARTBEAT' + interface: 'ens9' +internal_vip: '10.20.11.11' +public_vip: '10.20.11.11'