From: Aric Gardner Date: Mon, 15 Jan 2018 21:50:30 +0000 (+0000) Subject: Merge changes from topic 'fix-pdf-spec-deviations' X-Git-Tag: 6.0.0~35 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bd5656589b1b667bf4d8a2084370669a72b89be0;hp=fa70d3f001d9eaf97984bf755a192b700d292b38;p=pharos.git Merge changes from topic 'fix-pdf-spec-deviations' * changes: [PDF] zte-pod*: Fix spec deviations [PDF] lf-pod*: Fix spec deviations [PDF] intel-pod*: Fix spec deviations [PDF] ericsson-pod*: Fix spec deviations [PDF] bii-pod*: Fix spec deviations [PDF] arm-pod*: Fix spec deviations --- diff --git a/labs/huawei/idf-pod1.yaml b/labs/huawei/idf-pod1.yaml new file mode 100644 index 00000000..44fb4a06 --- /dev/null +++ b/labs/huawei/idf-pod1.yaml @@ -0,0 +1,44 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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 +############################################################################## +--- +### huawei-pod1 installer descriptor file ### + +idf: + version: 0.1 + # netconfig + net_config: + mgmt: + interface: 1 + vlan: native + network: 10.1.0.0 + mask: 24 + storage: + interface: 2 + vlan: 102 + network: 172.16.2.0 + mask: 24 + tenant: + interface: 2 + vlan: 101 + network: 172.16.1.0 + mask: 24 + external: + interface: 2 + vlan: native + network: 192.168.10.0 + mask: 24 + gateway: 192.168.10.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + + compass: + jumphost: + network: + node: diff --git a/labs/huawei/pod1.yaml b/labs/huawei/pod1.yaml new file mode 100644 index 00000000..f48d8239 --- /dev/null +++ b/labs/huawei/pod1.yaml @@ -0,0 +1,192 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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 +############################################################################## +--- +### POD descriptor file ### + +details: + pod_owner: Tianwei Wu + contact: wutianwei1@hauwei.com + lab: Huawei Lab + location: Shanghai, China + type: production + link: https://wiki.opnfv.org/display/pharos/Huawei+Hosting + +# jumphost +jumphost: + name: huawei-pod1-jump + node: &nodeparams + type: baremetal + vendor: huawei + model: Intel(R) Xeon(R) + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 16 + memory: 188G + disks: &disks + - name: 'disk1' + disk_capacity: 1.8T + disk_type: hdd + disk_interface: scsi + disk_rotation: 7200 + os: ubuntu-14.04 + remote_params: &remoteparas + type: ipmi + versions: + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAOv/AsqePJWJjzf30Lwzo2FezlXwM43uvGqSV + yt79ut92tDsPsfb3SkV9biTT1/VELCB/1AqZnxpwNwERv0D7YLy5fmkYLsWo + SgOYlgQ5CmTPIBw7A67Vz6bCXjlplnHbhqR+3dYreH4ijHQgBWTvhTi8w584 + 9Z8e0+fSJfruV+UBTF9n0dEWK9nqRQqWlDWasztxwyNpTPp4gVQs0gs2SkeP + XtHFfwIBJtopNuWsIhLtu/Hs5ljttL354RYF1PIVrsi1Xobl7O/I/ykq8PGg + qkFveh4c9nRe/LQ+u8ggWKDSHJodvAcJm+YQTW1CcATA04cuc6bKq6Xaf1Fn + kHKB5zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCKEo4HTTLDwyIixgCk + cHijgBA5aj2kBfsBvi99bXiDmet8] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAhb8LIGPlO3PUXwUS4zpOOmg3Wu35ZcdKUaMh + dFaW30bPBsle6V7N+2p8kLtpkvTQHyo3X1vOwhrEKwBvRHJ+XmgQCvYLqLXN + qZgNXWwAa2iJz6PjNs/rmvmoLx1pC3smRJeLGCpVSG6cLKXI02clDmnWxjKB + 3Sdhf/JKTLQgbsoTZYRSBGLM9/UC/Ox/n0kl8afuRfC88CytttnpyNWRBWZ6 + VV41hxCqshHhBvXnskMS/NEWfYWS972FOZ7FFYid7ZV3h6SbO4JOR7+haMbM + ublE8m1abmm1T5SYE245avYj94miYTaPIjq0mkI66xo+6haAlTPqq3/QeUGf + e0X2YjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpodDnNWoVIL6jIRiP + 6O85gBByiatZ0M0qtpNScQXGCRC5] + remote_management: + <<: *remoteparas + address: 172.16.130.28/24 + mac_address: "E0:24:7F:02:15:A5" + interfaces: + - name: 'nic1' + speed: 1gb + address: 192.168.10.6/24 + mac_address: "e0:24:7f:02:15:a3" + vlan: native + - name: 'nic2' + speed: 1gb + address: 10.1.0.1/24 + mac_address: "e0:24:7f:02:15:a4" + vlan: native + - name: 'nic3' + speed: 1gb + mac_address: "90:e2:ba:06:47:04" + vlan: native + - name: 'nic4' + speed: 1gb + address: 172.16.130.50/24 + mac_address: "90:e2:ba:06:47:05" + vlan: native +# host1 +nodes: + - name: host1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.26/24 + mac_address: "F8:4A:BF:55:A2:91" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8d" + - name: 'nic2' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8e" + - name: 'nic3' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8f" + - name: 'nic4' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:90" + # host2 + - name: host2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.27/24 + mac_address: "D8:49:0B:DA:5A:BB" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b7" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b8" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b9" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:5a:ba" + # host3 + - name: host3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.29/24 + mac_address: "78:D7:52:A0:B1:9D" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "78:d7:52:a0:b1:99" + - name: 'nic2' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9a" + - name: 'nic3' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9b" + - name: 'nic4' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9c" + # host4 + - name: host4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.30/24 + mac_address: "D8:49:0B:DA:5B:61" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5d" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5e" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5f" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:5b:60" + # host5 + - name: host5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.31/24 + mac_address: "D8:49:0B:DA:56:89" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:56:85" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:56:86" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:56:87" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:56:88"