From b0617530e5b00ae85a1b3d00519afbd942a53539 Mon Sep 17 00:00:00 2001 From: agardner Date: Fri, 1 Dec 2017 16:46:35 -0500 Subject: 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 --- labs/zte/pod3/daisy/config/deploy.yml | 73 +++++++++++++++++++++++++++++ labs/zte/pod3/daisy/config/network.yml | 85 ++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 labs/zte/pod3/daisy/config/deploy.yml create mode 100644 labs/zte/pod3/daisy/config/network.yml (limited to 'labs/zte/pod3') 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' -- cgit 1.2.3-korg