From d81cf15e2ed3f97aaf1444923aed90f8822ba06d Mon Sep 17 00:00:00 2001 From: Julien Date: Tue, 17 Oct 2017 22:31:27 +0800 Subject: rename pdf name for bii lab The standard name is: lab/(lab_name)/pod#.yaml Change-Id: Ib353c59bb499d17a02d708427e54dd40dda31d1a Signed-off-by: Julien --- labs/bii/bii_pod1.yaml | 193 ------------------------------------------------- labs/bii/pod1.yaml | 193 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 193 deletions(-) delete mode 100755 labs/bii/bii_pod1.yaml create mode 100644 labs/bii/pod1.yaml diff --git a/labs/bii/bii_pod1.yaml b/labs/bii/bii_pod1.yaml deleted file mode 100755 index a15edcb..0000000 --- a/labs/bii/bii_pod1.yaml +++ /dev/null @@ -1,193 +0,0 @@ -### This is a BII POD1 descriptor file ### - -details: - pod owner: ylong@BII - contact: ylong@biigroup.cn, zjtang@biigroup.cn - lab: BII Pharos LAB - location: BDA, Beijing, China - type: development - link: https://wiki.opnfv.org/display/pharos/BII -################################################### -net_config: - admin: - interface: 0 - vlan: 0 - network: 10.20.0.0 - mask: 24 - gateway: 10.20.0.1 - dns: 10.20.0.1 - mgmt: - interface: 0 - vlan: 102 - network: 192.168.102.0 - mask: 24 - storage: - interface: 0 - vlan: 101 - network: 192.168.101.0 - mask: 24 - private: - interface: 0 - vlan: 103 - network: 192.168.103.0 - mask: 24 - public: - interface: 1 - vlan: 0 - network: 192.168.20.0 - mask: 24 -################################################### -jumphost: - name: fuel - node: - type: baremetal # can be virtual or baremetal - vendor: Dell Inc. - model: powerEdge 720 - arch: x86_64 - cpus: 2 - cpu_cflags: hasewell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads - memory: 16G - disks: # disk list - - name: 'disk1' # first disk - disk_capacity: 300G # volume - disk_type: hdd # several disk types possible - disk_interface: sas # several interface types possible - disk_rotation: 15000 # define rotation speed of disk - - name: 'disk2' # second disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk3' # third disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk4' # fourth disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk5' # fifth disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - os: centos-7.3 #operation system installed - remote_params: &remote_params - type: ipmi - versions: - - 2.0 - user: root - pass: admin - remote_management: - <<: *remote_params - address: 192.168.20.200 - mac_address: "44:A8:42:1A:68:78" - interfaces: # physical interface list - - "44:a8:42:15:10:03" - - "44:a8:42:15:10:04" - fixed_ips: - admin: 10.20.0.2 - public: 192.168.20.5 -################################################### -nodes: - - name: compute1 - node: &nodeparas - type: baremetal - vendor: Dell Inc. - model: powerEdge 720 - arch: x86_64 - cpus: 2 - cpu_cflags: hasewell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads - memory: 32G - disks: &disk_A # disk list - - name: 'disk1' # first disk - disk_capacity: 128G # volume - disk_type: ssd # several disk types possible - disk_interface: sas # several interface types possible - disk_rotation: 15000 # define rotation speed of disk - - name: 'disk2' # second disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk3' # third disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk4' # fourth disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk5' # fifth disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - remote_management: - <<: *remote_params - address: 192.168.20.201 - mac_address: "44:A8:42:1A:70:BE" - interfaces: # physical interface list - - "44:a8:42:14:ee:64" - fixed_ips: - admin: 10.20.0.4 -######################################## - - name: compute2 - node: *nodeparas - disks: *disks_A - remote_management: - <<: *remote_params - address: 192.168.20.202 - mac_address: "44:A8:42:1A:76:26" - interfaces: - - "44:a8:42:14:cb:31" - fixed_ips: - admin: 10.20.0.5 -######################################## - - name: controller1 - node: *nodeparas - disks: *disks_A - remote_management: - <<: *remote_params - address: 192.168.20.203 - mac_address: "44:A8:42:1A:49:A5" - interfaces: - - "44:a8:42:14:cd:0d" - - "44:a8:42:14:cd:0e" - fixed_ips: - admin: 10.20.0.6 - public: 192.168.20.12 -######################################## - - name: controller2 - node: *nodeparas - disks: *disks_A - remote_management: - <<: *remote_params - address: 192.168.20.204 - mac_address: "44:A8:42:1A:76:2C" - interfaces: - - "44:a8:42:15:1b:e6" - - "44:a8:42:15:1b:e7" - fixed_ips: - admin: 10.20.0.7 - public: 192.168.20.13 -######################################## - - name: controller3 - node: *nodeparas - disks: *disks_A - remote_management: - <<: *remote_params - address: 192.168.20.205 - mac_address: "44:A8:42:13:D5:1B" - interfaces: - - "44:a8:42:14:fc:1a" - - "44:a8:42:14:fc:1b" - fixed_ips: - admin: 10.20.0.8 - public: 192.168.20.14 diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml new file mode 100644 index 0000000..a15edcb --- /dev/null +++ b/labs/bii/pod1.yaml @@ -0,0 +1,193 @@ +### This is a BII POD1 descriptor file ### + +details: + pod owner: ylong@BII + contact: ylong@biigroup.cn, zjtang@biigroup.cn + lab: BII Pharos LAB + location: BDA, Beijing, China + type: development + link: https://wiki.opnfv.org/display/pharos/BII +################################################### +net_config: + admin: + interface: 0 + vlan: 0 + network: 10.20.0.0 + mask: 24 + gateway: 10.20.0.1 + dns: 10.20.0.1 + mgmt: + interface: 0 + vlan: 102 + network: 192.168.102.0 + mask: 24 + storage: + interface: 0 + vlan: 101 + network: 192.168.101.0 + mask: 24 + private: + interface: 0 + vlan: 103 + network: 192.168.103.0 + mask: 24 + public: + interface: 1 + vlan: 0 + network: 192.168.20.0 + mask: 24 +################################################### +jumphost: + name: fuel + node: + type: baremetal # can be virtual or baremetal + vendor: Dell Inc. + model: powerEdge 720 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell # add values based on CFLAGS in GCC + cores: 8 # physical cores, not including hyper-threads + memory: 16G + disks: # disk list + - name: 'disk1' # first disk + disk_capacity: 300G # volume + disk_type: hdd # several disk types possible + disk_interface: sas # several interface types possible + disk_rotation: 15000 # define rotation speed of disk + - name: 'disk2' # second disk + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk3' # third disk + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk4' # fourth disk + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk5' # fifth disk + disk_capacity: 300G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + os: centos-7.3 #operation system installed + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: root + pass: admin + remote_management: + <<: *remote_params + address: 192.168.20.200 + mac_address: "44:A8:42:1A:68:78" + interfaces: # physical interface list + - "44:a8:42:15:10:03" + - "44:a8:42:15:10:04" + fixed_ips: + admin: 10.20.0.2 + public: 192.168.20.5 +################################################### +nodes: + - name: compute1 + node: &nodeparas + type: baremetal + vendor: Dell Inc. + model: powerEdge 720 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell # add values based on CFLAGS in GCC + cores: 8 # physical cores, not including hyper-threads + memory: 32G + disks: &disk_A # disk list + - name: 'disk1' # first disk + disk_capacity: 128G # volume + disk_type: ssd # several disk types possible + disk_interface: sas # several interface types possible + disk_rotation: 15000 # define rotation speed of disk + - name: 'disk2' # second disk + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk3' # third disk + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk4' # fourth disk + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + - name: 'disk5' # fifth disk + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 15000 + remote_management: + <<: *remote_params + address: 192.168.20.201 + mac_address: "44:A8:42:1A:70:BE" + interfaces: # physical interface list + - "44:a8:42:14:ee:64" + fixed_ips: + admin: 10.20.0.4 +######################################## + - name: compute2 + node: *nodeparas + disks: *disks_A + remote_management: + <<: *remote_params + address: 192.168.20.202 + mac_address: "44:A8:42:1A:76:26" + interfaces: + - "44:a8:42:14:cb:31" + fixed_ips: + admin: 10.20.0.5 +######################################## + - name: controller1 + node: *nodeparas + disks: *disks_A + remote_management: + <<: *remote_params + address: 192.168.20.203 + mac_address: "44:A8:42:1A:49:A5" + interfaces: + - "44:a8:42:14:cd:0d" + - "44:a8:42:14:cd:0e" + fixed_ips: + admin: 10.20.0.6 + public: 192.168.20.12 +######################################## + - name: controller2 + node: *nodeparas + disks: *disks_A + remote_management: + <<: *remote_params + address: 192.168.20.204 + mac_address: "44:A8:42:1A:76:2C" + interfaces: + - "44:a8:42:15:1b:e6" + - "44:a8:42:15:1b:e7" + fixed_ips: + admin: 10.20.0.7 + public: 192.168.20.13 +######################################## + - name: controller3 + node: *nodeparas + disks: *disks_A + remote_management: + <<: *remote_params + address: 192.168.20.205 + mac_address: "44:A8:42:13:D5:1B" + interfaces: + - "44:a8:42:14:fc:1a" + - "44:a8:42:14:fc:1b" + fixed_ips: + admin: 10.20.0.8 + public: 192.168.20.14 -- cgit 1.2.3-korg