diff options
| -rw-r--r-- | config/installers/daisy/network-dpdk.yaml.j2 | 102 | ||||
| -rw-r--r-- | config/installers/daisy/network.yaml.j2 | 102 | ||||
| -rw-r--r-- | labs/zte/pod1.yaml | 22 | ||||
| -rw-r--r-- | labs/zte/pod2.yaml | 22 | ||||
| -rw-r--r-- | labs/zte/pod3.yaml | 22 |
5 files changed, 264 insertions, 6 deletions
diff --git a/config/installers/daisy/network-dpdk.yaml.j2 b/config/installers/daisy/network-dpdk.yaml.j2 new file mode 100644 index 00000000..507e7cfc --- /dev/null +++ b/config/installers/daisy/network-dpdk.yaml.j2 @@ -0,0 +1,102 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation 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 +############################################################################## + +############################################################################## +# Description +# MANAGEMENT: used for management +# STORAGE: used for storage access +# EXTERNAL: tenant public/floating IP associated network +# PUBLICAPI: used for horizon access, openstack API access +# TENANT: used for tenant access, vlan and VxLan supported, default VxLan +# HEARTBEAT: used for heartbeat, requires a dedicated interface +############################################################################## + +--- + +network-config-metadata: + title: 'Deployment Adapter for baremetal POD' + version: '0.1' + created: 'Nov 22 2017' + comment: 'For Daisy initial' + +{%- set mapping = {'HEARTBEAT': 'admin', + 'MANAGEMENT': 'mgmt', + 'PUBLICAPI': 'mgmt', + 'STORAGE': 'storage', + 'TENANT': 'public', + 'EXTERNAL': 'public'} -%} + +{%- if "idf" in conf and ("daisy" in conf["idf"] or "fuel" in conf["idf"]) -%} + {%- if "daisy" in conf["idf"] -%} + {%- set installer = "daisy" -%} + {%- else -%} + {%- set installer = "fuel" -%} + {%- endif %} + +networks: + + {%- set networks = {} -%} + {%- for key in mapping -%} + {%- set net_data = conf['net_config'][mapping[key]] -%} + {%- set interface = net_data['interface'] -%} + {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%} + {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%} + {%- set vlan = net_data['vlan'] -%} + {%- if vlan == "native" or vlan == None -%} + {%- set vlan = "null" -%} + {%- endif -%} + {%- set network = net_data['network'] -%} + {%- set ips = network.split(".") -%} + {%- set mask = net_data['mask'] -%} + {%- if 'ip-range' in net_data -%} + {%- set ip_range = net_data['ip-range'] -%} + {%- set (start, end) = ip_range.split("-") -%} + {%- else -%} + {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%} + {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%} + {%- endif -%} + {%- set vip = start -%} + + {%- if 'gateway' in net_data -%} + {%- set gateway = net_data.gateway -%} + {%- else -%} + {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%} + {%- endif -%} + + {%- set networks = networks.update({key: {'interface_name': interface_name, + 'bus_addr': bus_addr, + 'vlan': vlan, + 'network': network, + 'mask': mask, + 'start': start, + 'end': end, + 'vip': vip, + 'gateway': gateway + } + }) %} + + - cidr: '{{ network }}/{{ mask }}' + gateway: '{{ gateway }}' + ip_ranges: + - 'start': '{{ start }}' + 'end': '{{ end }}' + vlan_id: {{ vlan }} + name: '{{ key }}' + {%- endfor %} + +interfaces: + {%- for key in mapping %} + - name: '{{ key }}' + interface: '{{ networks[key].interface_name }}' + {%- endfor %} + +internal_vip: '{{ networks['MANAGEMENT'].vip }}' +public_vip: '{{ networks['PUBLICAPI'].vip }}' + +{%- endif %} diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 new file mode 100644 index 00000000..9eef7390 --- /dev/null +++ b/config/installers/daisy/network.yaml.j2 @@ -0,0 +1,102 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation 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 +############################################################################## + +############################################################################## +# Description +# MANAGEMENT: used for management +# STORAGE: used for storage access +# EXTERNAL: tenant public/floating IP associated network +# PUBLICAPI: used for horizon access, openstack API access +# TENANT: used for tenant access, vlan and VxLan supported, default VxLan +# HEARTBEAT: used for heartbeat, requires a dedicated interface +############################################################################## + +--- + +network-config-metadata: + title: 'Deployment Adapter for baremetal POD' + version: '0.1' + created: 'Nov 22 2017' + comment: 'For Daisy initial' + +{%- set mapping = {'HEARTBEAT': 'admin', + 'MANAGEMENT': 'mgmt', + 'PUBLICAPI': 'mgmt', + 'STORAGE': 'storage', + 'TENANT': 'private', + 'EXTERNAL': 'public'} -%} + +{%- if "idf" in conf and ("daisy" in conf["idf"] or "fuel" in conf["idf"]) -%} + {%- if "daisy" in conf["idf"] -%} + {%- set installer = "daisy" -%} + {%- else -%} + {%- set installer = "fuel" -%} + {%- endif %} + +networks: + + {%- set networks = {} -%} + {%- for key in mapping -%} + {%- set net_data = conf['net_config'][mapping[key]] -%} + {%- set interface = net_data['interface'] -%} + {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%} + {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%} + {%- set vlan = net_data['vlan'] -%} + {%- if vlan == "native" or vlan == None -%} + {%- set vlan = "null" -%} + {%- endif -%} + {%- set network = net_data['network'] -%} + {%- set ips = network.split(".") -%} + {%- set mask = net_data['mask'] -%} + {%- if 'ip-range' in net_data -%} + {%- set ip_range = net_data['ip-range'] -%} + {%- set (start, end) = ip_range.split("-") -%} + {%- else -%} + {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%} + {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%} + {%- endif -%} + {%- set vip = start -%} + + {%- if 'gateway' in net_data -%} + {%- set gateway = net_data.gateway -%} + {%- else -%} + {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%} + {%- endif -%} + + {%- set networks = networks.update({key: {'interface_name': interface_name, + 'bus_addr': bus_addr, + 'vlan': vlan, + 'network': network, + 'mask': mask, + 'start': start, + 'end': end, + 'vip': vip, + 'gateway': gateway + } + }) %} + + - cidr: '{{ network }}/{{ mask }}' + gateway: '{{ gateway }}' + ip_ranges: + - 'start': '{{ start }}' + 'end': '{{ end }}' + vlan_id: {{ vlan }} + name: '{{ key }}' + {%- endfor %} + +interfaces: + {%- for key in mapping %} + - name: '{{ key }}' + interface: '{{ networks[key].interface_name }}' + {%- endfor %} + +internal_vip: '{{ networks['MANAGEMENT'].vip }}' +public_vip: '{{ networks['PUBLICAPI'].vip }}' + +{%- endif %} diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index 83a59af3..bdc5ab44 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.yaml @@ -77,8 +77,26 @@ jumphost: type: ipmi versions: - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAV6BaFHBOwnf4GkZaHcoBjUi97U+68ossDNM1 + fRRvw+whiNZ/UMkEheasAW2/sP//W+B8cIMLrFpA6vqYpn5wzFSWOsnXRDOW + hz1746p600c9TjsGbpMPtbNGgi68t3nB8VQoW7e57bM+yWVvJzLSI2my8bEw + a6FNuICymRAeXeyZjXSJ7w71F1XA8stuDSXm4/kAvigNTmS4kdvm6NYSNSZ9 + +DtNJjcVQtXBpzNIB8sf+y9yTt1d58ZaSBtCLBIRoG+vSpFzJjUyPOdv01rP + pMleQ7IJHrucl8p35/pQ2nUOErrSBwNLq+XMIusIRySW1gAbxFn/I+d1aYsK + Txv0nDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAq1Y9d1AWsRxLIGNXE + 1zJGgBCXqWtf5xcL5n9/YtpHtmA0] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAhnPH8p1YJQDJ3wS/0+KZemgS4oTX2gNKMJsf + TDmJzQNAcGnuORSEoowdTGUq65QFlb3yUi5B7mHaer2mN/4v12rEKc7TYRfB + PBNzpudCwB1UtMJTDBjrKtpVv4iWclAKZmreV4VKCFAFWHeQEzQhBQGBoykk + UKRdNCKcuBhoNa5d9QEjgpTse5PtEgPZxPQsKFh4RDQJRpL+JUHw05Cs8rv0 + PR6UAnvrbd/pcYnUZUkNZc9x7bfedG6274A88DQ6sGFAbLjH2YvnJrNbUvy5 + Le7bUT5G1V1ymtVpxg30ECDaSX4zKMeFgcHdU+dPAqSHfCkD1wLI7Cn5o7j2 + uZZORTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGF9iDD5dBZN8p2qbS + 4IoqgBAYdFlBw90sTOBqrhoHmRbr] remote_management: <<: *remote_params address: diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index fac1f9a7..9cf629f3 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -78,8 +78,26 @@ jumphost: type: ipmi versions: - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAjGsowRz086iBgT7GNCXRBJiDP2wnTz8LBbT3 + /P0pVQd06kLmnkQmTi49VNWeEHRrrt5PtNzthESzs5YLPugzPn7m2WMvrY62 + 0d3upsHXOc4B+pSYELiExSsnLheowpKyo6/HJfmqqemsKKbfEf6d6oCWJyfC + SI8lGbAFntjjg1rN19IEg9tSEndLSmnFsJfPKxJ4VoZHAQJXXtPSGiod7qPV + a0VoVXTSxdaUHVKe4QBnVRnxySxETc3ODPaSZ/glVCha/p+bAueRNFrLikCY + /7Ize90GeZwUTAdIabT1kalGOqDU43zdPDae2bYdqi7/MfhftIo0iUfL/KYs + DmpuADA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB3doQ87dzhGnTj6eDW + xD3DgBC1WpkH6osu52WpkWz035Yt] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAS6Xz1p73hApGo78ebuKNaGh2Vx0jSg5rkqcA + tGpR1ManuGedDFeZSuDmXAghZ3DoHEG0E9s/XfNlxJr7hn9XXGh4ZL9sfxdK + NXXXjyv0u7KB7xjju5/wgR7vfpVYl81rcatlOYFH+k/1V2BdZOA4Z4u0ew0L + yPA4jkXBVH8FcWvvLReunXsq0LDHeVSUxvFpRZrDVuhmgYtPnsnmrce1CkG9 + Ro2WInZ05nyP+d75KoYIRzhXsQH2kUCXVuDUzEZh7+Iu4g5nTaBZkInwyFHg + FrNTuK33zL0/oXJepNiZMTcUHAgQauyIeZaRld87IibpcykxLeCnpYe/GQCA + SkmKXzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBBtn/v3HNPTNYCvP1e + 2+PxgBC5OzeXar0HSyATMD/Z7K0x] remote_management: <<: *remote_params address: diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml index c3c835b8..d930d52c 100644 --- a/labs/zte/pod3.yaml +++ b/labs/zte/pod3.yaml @@ -77,8 +77,26 @@ jumphost: type: ipmi versions: - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEADgVg8o88krQcS+2MfYJL+9zQ3rY2FV7vDSWf + /1ddIvlD8FkCZ9z33o6o8lwKcAJqc9spWrZAEIZtifIeNgdVo0ju2I2aYDN6 + itK+RAg4LItCFvnfJD3UMwh0JfjGBI1AsTCT/GB3MdGOgBCcOQnguyCHLhFL + tnVmmoZCOdjGpuInTcEQJPU5jVZLo1cVsX+wAnU+jqmoVMBXDtliv9kbkqoz + jdNJEeMxe9q9neTM23vXWEtWOdOLYPBox6xSN9hyYri3IRHHrIhb4DMILQx6 + ZS7/lSgbnUBaGx8K4SiEz99Wsll8Tim8KX79BEIVJhpqLmmFmPlGKZwGUi06 + d8NY6zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIaNintvK/akCPueun + WuV4gBDZrP04W2rq3w4SokOEnPRs] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAWq1q+u3W7VcZQ2/yAFGMsjuNIo8OTX8JQgxT + pEoijuuLCLZ7pRwjd+pAESQZiPBqDf+CbYDpyjiyAm7GkKwk4vtrNY4JLvSZ + L2ci58ZqL2eOh2a4pLvi/s+gd1qaPk3aIzpCQc/Js3jfpeL4RCDmwjJc5WmE + aGmEv/UDD/WqMjztGPVyU/QNXl5lDaRZmC2vywJGYEJDnQDZWn9inKtErMpr + a7lvq0sRIb4okxH7Wd0yl3SgjpGN5+wVAYUSRoqbX/TaDkQVt32HY3cI5ni/ + mraT38QkjsB9n435ottOArJ6g7Z5Q0V5NPtiQe6zKGMHwenzEXPNT/HjvoEA + D1j48jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCeXP53GSCSDveAhe6x + ZIpvgBCa0QYVwRsEcqVofk2pmPKq] remote_management: <<: *remote_params address: |