diff options
29 files changed, 904 insertions, 163 deletions
@@ -17,13 +17,10 @@ Aric Gardner <agardner@linuxfoundation.org> Fatih Degirmenci <fatih.degirmenci@ericsson.com> Guillermo Herrero <guillermo.herrero@enea.com> Jack Morgan <jack.morgan@intel.com> -Jose Lausuch <jalausuch@suse.com> Julien Zhang <zhang.jun3g@zte.com.cn> -Morgan Richomme <morgan.richomme@orange.com> Parker Berberian <pberberian@iol.unh.edu> Trevor Bramwell <tbramwell@linuxfoundation.org> Trevor Cooper <trevor.cooper@intel.com> -Wenjing Chu <wenjing.chu@huawei.com> Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/ Link(s) to approval of additional committers: diff --git a/config/installers/apex/pod_config.yaml.j2 b/config/installers/apex/pod_config.yaml.j2 index b681215e..d4db9ef7 100644 --- a/config/installers/apex/pod_config.yaml.j2 +++ b/config/installers/apex/pod_config.yaml.j2 @@ -1,11 +1,18 @@ +############################################################################## +# Copyright (c) 2018 Red Hat Inc. 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 +############################################################################## --- nodes: node1: mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][0]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][0]['node']['cpus'] }} memory: {{ conf['nodes'][0]['node']['memory'] }} disk: 40 @@ -15,9 +22,9 @@ nodes: node2: mac_address: "{{ conf['nodes'][1]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][1]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][1]['node']['cpus'] }} memory: {{ conf['nodes'][1]['node']['memory'] }} disk: 40 @@ -27,9 +34,9 @@ nodes: node3: mac_address: "{{ conf['nodes'][2]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][2]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][2]['node']['cpus'] }} memory: {{ conf['nodes'][2]['node']['memory'] }} disk: 40 @@ -39,9 +46,9 @@ nodes: node4: mac_address: "{{ conf['nodes'][3]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][3]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][3]['node']['cpus'] }} memory: {{ conf['nodes'][3]['node']['memory'] }} disk: 40 @@ -51,9 +58,9 @@ nodes: node5: mac_address: "{{ conf['nodes'][4]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][4]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][4]['node']['cpus'] }} memory: {{ conf['nodes'][4]['node']['memory'] }} disk: 40 diff --git a/config/installers/compass4nfv/network.yml.j2 b/config/installers/compass4nfv/network.yml.j2 index a98cc4a9..b84c201b 100644 --- a/config/installers/compass4nfv/network.yml.j2 +++ b/config/installers/compass4nfv/network.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/network_ocl.yml.j2 b/config/installers/compass4nfv/network_ocl.yml.j2 index 4d1342d9..f435538c 100644 --- a/config/installers/compass4nfv/network_ocl.yml.j2 +++ b/config/installers/compass4nfv/network_ocl.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/network_onos.yml.j2 b/config/installers/compass4nfv/network_onos.yml.j2 index 90174c85..7213e77f 100644 --- a/config/installers/compass4nfv/network_onos.yml.j2 +++ b/config/installers/compass4nfv/network_onos.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/network_openo.yml.j2 b/config/installers/compass4nfv/network_openo.yml.j2 index 37b34c7f..9e3c6f09 100644 --- a/config/installers/compass4nfv/network_openo.yml.j2 +++ b/config/installers/compass4nfv/network_openo.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 index 2dcf048c..bb235fb4 100644 --- a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 index 6deb19de..9e7e01cc 100644 --- a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 index d03c7e87..c7272cf3 100644 --- a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 index d3d8aa1d..72d3f4c7 100644 --- a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 index 1ba947a5..3a0c222e 100644 --- a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index d81769c4..d019c230 100644 --- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 index 8c731a5b..2adce440 100644 --- a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 index bbc4723d..230a601f 100644 --- a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 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 diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index f5ac6150..1fad1ac8 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. +# Copyright (c) 2018 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 diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2 index 3e4ab106..30147a5e 100644 --- a/config/installers/daisy/pod_config.yaml.j2 +++ b/config/installers/daisy/pod_config.yaml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. +# Copyright (c) 2018 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 @@ -86,6 +86,6 @@ daisy_passwd: 'r00tme' {% if 'fixed_ips' in conf['jumphost'] -%} daisy_gateway: {{ conf['jumphost']['fixed_ips']['admin'] }} {%- else -%} -daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'][0] }} +daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'] }} {%- endif %} ceph_disk_name: '/dev/sdb' diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 8a4d869e..6d0e7978 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## --- {%- if conf.idf is defined and conf.idf.fuel is defined -%} {%- if conf.idf.net_config is defined -%} @@ -5,6 +12,7 @@ {%- set net_mgmt = conf.idf.net_config.mgmt.network -%} {%- set net_private = conf.idf.net_config.private.network -%} {%- set net_public = conf.idf.net_config.public.network -%} + {%- set net_public_mask = conf.idf.net_config.public.mask -%} {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%} {%- set vlan_private = conf.idf.net_config.private.vlan -%} {%- if conf.idf.net_config.public.dns is defined -%} @@ -19,6 +27,7 @@ {%- set net_mgmt = '172.16.10.0' -%} {%- set net_private = '10.1.0.0' -%} {%- set net_public = '172.30.10.0' -%} + {%- set net_public_mask = '24' -%} {%- set vlan_mgmt = '300' -%} {%- set vlan_private = '1000' -%} {%- set pxe_interface = 0 -%} @@ -29,7 +38,7 @@ {%- endif -%} {%- if net_public_gw is not defined -%} {%- set net_public_gw = net_public | ipaddr_index('1') -%} - {%- endif %} + {%- endif -%} parameters: _param: @@ -39,6 +48,7 @@ parameters: opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }} opnfv_infra_config_address: {{ net_mgmt | ipaddr_index(100) }} + opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index(2) }} opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index(3) }} opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index(3) }} opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index(140) }} @@ -47,9 +57,8 @@ parameters: opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index(143) }} opnfv_infra_maas_pxe_network_address: {{ net_admin }} - opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index(3) }} - opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(5) }} - opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(250) }} + opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(4) }} + opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(100) }} opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }} opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }} @@ -60,6 +69,7 @@ parameters: opnfv_openstack_proxy_address: {{ net_public | ipaddr_index(103) }} opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index(104) }} opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index(105) }} + opnfv_openstack_proxy_control_address: {{ net_mgmt | ipaddr_index(103) }} opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index(104) }} opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index(105) }} opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index(10) }} @@ -92,7 +102,11 @@ parameters: opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index(111) }} + opnfv_net_public: {{ net_public }}/{{ net_public_mask }} + opnfv_net_public_mask: {{ net_public_mask | netmask }} opnfv_net_public_gw: {{ net_public_gw }} + opnfv_net_public_pool_start: {{ net_public | ipaddr_index(80) }} + opnfv_net_public_pool_end: {{ net_public | ipaddr_index(100) }} opnfv_name_servers: {{ dns_public }} opnfv_dns_server01: '{{ dns_public[0] }}' diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2 index 4bb49d56..e18ba86f 100644 --- a/config/installers/joid/pod_config.yaml.j2 +++ b/config/installers/joid/pod_config.yaml.j2 @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Canonical 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 +############################################################################## --- lab: location: intel diff --git a/config/pdf/pod1.encrypted.yaml b/config/pdf/pod1.encrypted.yaml index 5679de66..c1e8f78c 100644 --- a/config/pdf/pod1.encrypted.yaml +++ b/config/pdf/pod1.encrypted.yaml @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Intel Corporation, 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 +############################################################################## --- ### POD descriptor file ### diff --git a/config/pdf/pod1.yaml b/config/pdf/pod1.yaml index a2a1e555..c2d07349 100644 --- a/config/pdf/pod1.yaml +++ b/config/pdf/pod1.yaml @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Intel 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 +############################################################################## --- ### POD descriptor file ### diff --git a/config/utils/README.eyaml.rst b/config/utils/README.eyaml.rst index 0031d9d8..1f584261 100644 --- a/config/utils/README.eyaml.rst +++ b/config/utils/README.eyaml.rst @@ -1,6 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. SPDX-License-Identifier: CC-BY-4.0 -.. (c) 2017 OPNFV and others. +.. (c) 2018 OPNFV and others. Use eyaml to decrypt secret values ================================== diff --git a/config/utils/check-jinja2.sh b/config/utils/check-jinja2.sh index 1001b156..59a6506b 100755 --- a/config/utils/check-jinja2.sh +++ b/config/utils/check-jinja2.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-license-identifier: Apache-2.0 ############################################################################## -# Copyright (c) 2016 Linux Foundation and others. +# Copyright (c) 2018 Linux Foundation 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 @@ -12,8 +12,15 @@ set +x set +o errexit export PATH=$PATH:/usr/local/bin/ +# Optional filtering of test matrix: per-lab, per-pod, per-installer +# e.g. To check zte-pod{2,3} against all installer adapters: +# ./config/utils/check-jinja2.sh zte 'pod(2|3)' +FILTER_LAB=${1:-*} # e.g. 'zte' (glob) +FILTER_POD=${2:-(pod|virtual)[[:digit:]]+} # e.g. 'pod1' (regex) +FILTER_IA=${3:-*} # e.g. 'fuel' (glob) + GEN_CFG='./config/utils/generate_config.py' -INSTALLER_ADAPTERS='./config/installers/*' +INSTALLER_ADAPTERS="./config/installers/${FILTER_IA}" TMPF='/tmp/out.yml' # should be outside Jenkins WS to prevent data leakage RC=0 @@ -25,6 +32,7 @@ for adapter in 'PDF Verify Matrix' ${INSTALLER_ADAPTERS}; do done # Iterate all PDFs, check with each installer adapter, log results +# shellcheck disable=SC2086 while IFS= read -r lab_config; do SUMMARY+="\n${lab_config#labs/};" lab_nodes=$(grep -ce 'node:' "${lab_config}") @@ -70,7 +78,8 @@ while IFS= read -r lab_config; do done < <(find "${adapter}" -name '*.j2') SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};" done -done < <(find 'labs' -name 'pod*.yaml') +done < <(find labs/${FILTER_LAB} -regextype egrep \ + -regex "labs/.+/${FILTER_POD}.yaml") rm -f "${TMPF}" cat <<EOF diff --git a/config/utils/config.example.yaml b/config/utils/config.example.yaml index 084d11d2..3a10a144 100644 --- a/config/utils/config.example.yaml +++ b/config/utils/config.example.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 OPNFV and others. +# Copyright (c) 2018 OPNFV and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py index cf558e28..5dbdb7d1 100755 --- a/config/utils/generate_config.py +++ b/config/utils/generate_config.py @@ -1,6 +1,6 @@ #!/usr/bin/python ############################################################################## -# Copyright (c) 2017 OPNFV and others. +# Copyright (c) 2018 OPNFV and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -39,6 +39,15 @@ def ipaddr_index(base_address, index): base_address_str = str(base_address) return ipaddress.ip_address(base_address_str) + int(index) +# Custom filter to transform a prefix netmask to IP address format netmask +def netmask(prefix): + """Get netmask from prefix length integer""" + try: + prefix_str = unicode(prefix) + except NameError as ex: + prefix_str = str(prefix) + return ipaddress.IPv4Network("1.0.0.0/"+prefix_str).netmask + # Custom filter to convert between processor architecture # (as reported by $(uname -m)) and DPKG-style architecture def dpkg_arch(arch, to_dpkg=True): @@ -50,6 +59,7 @@ def dpkg_arch(arch, to_dpkg=True): ENV = Environment(loader=FileSystemLoader(os.path.dirname(ARGS.jinja2))) ENV.filters['ipaddr_index'] = ipaddr_index +ENV.filters['netmask'] = netmask ENV.filters['dpkg_arch'] = dpkg_arch # Run `eyaml decrypt` on the whole file, but only if PDF data is encrypted diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml new file mode 100644 index 00000000..6b41363d --- /dev/null +++ b/labs/arm/idf-pod7.yaml @@ -0,0 +1,79 @@ +############################################################################## +# Copyright (c) 2017 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 +############################################################################## +--- +### ARM POD 7 installer descriptor file ### + +idf: + version: 0.1 + net_config: + oob: + ip-range: 10.0.16.2-10.0.16.6 + vlan: native + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2343 + network: 172.16.10.0 + mask: 24 + storage: + interface: 1 + vlan: 2344 + network: 10.2.0.0 + mask: 24 + private: + interface: 1 + vlan: 2345 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.16.0 + mask: 24 + gateway: 10.0.16.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin15_br0' + mgmt: 'mgmt15_br0' + private: ~ + public: 'public15_br0' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces_a + # Ordered-list, index should be in sync with interface index in PDF + - 'enP5s3' + - 'enP2p1s0f2' + - 'enP2p1s0f1' + - 'enP2p1s0f3' + busaddr: &busaddr_a + # Bus-info reported by `ethtool -i ethX` + - '0005:90:00.0' + - '0002:01:00.2' + - '0002:01:00.1' + - '0002:01:00.3' + - interfaces: *interfaces_a + busaddr: *busaddr_a + - interfaces: *interfaces_a + busaddr: *busaddr_a + - interfaces: &interfaces_b + - 'eth0' + - 'eth1' + busaddr: &busaddr_b + - 'e0700000.xgmac' + - 'e0900000.xgmac' + - interfaces: *interfaces_b + busaddr: *busaddr_b diff --git a/labs/arm/pod7.yaml b/labs/arm/pod7.yaml new file mode 100644 index 00000000..bb624799 --- /dev/null +++ b/labs/arm/pod7.yaml @@ -0,0 +1,241 @@ +############################################################################## +# Copyright (c) 2018 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 +############################################################################## +--- +### Enea ARM POD 7 descriptor file ### + +version: 1.0 +details: + pod_owner: ENEA AB + contact: dan.lilliehorn@enea.com + lab: ENEA lab + location: Stockholm, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Enea+Hosting +############################################################################## +jumphost: + name: jenkins-slave-arm-pod7 + node: + type: baremetal + vendor: AppliedMicro + model: XGene 1 + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm cpuid + cores: 8 + memory: 32G + disks: + # /dev/sda + - name: disk1 + disk_capacity: 120G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + # /dev/sdb + - name: disk2 + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + # /dev/sdc + - name: disk3 + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: admin + remote_management: + <<: *remote_params + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" + interfaces: + # eth0, Not connected + - mac_address: "00:01:73:02:3b:28" + address: 192.168.11.1 + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected for PXE + - mac_address: "00:01:73:02:3b:29" + speed: 1gb + features: '' + name: 'nic2' + # eth2, Not connected + - mac_address: "00:01:73:02:3b:2a" + speed: 1gb + features: '' + name: 'nic3' + # eth3, Connected for truck traffic + - mac_address: "00:01:73:02:3b:2b" + speed: 10gb + features: '' + name: 'nic4' +############################################################################## +nodes: + - name: cn8890-6 + node: &nodeparams_a + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 128G + disks: &disks_a + - name: 'disk1' + disk_capacity: 500G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.16.2 + mac_address: "40:8D:5C:BA:D2:32" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3d:93:14" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:03:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:03:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:03:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: cn8890-8 + node: *nodeparams_a + disks: *disks_a + remote_management: + <<: *remote_params + address: 10.0.16.3 + mac_address: "40:8D:5C:BA:B9:60" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3f:7f:f3" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:05:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:05:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:05:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: cn8890-10 + node: *nodeparams_a + disks: *disks_a + remote_management: + <<: *remote_params + address: 10.0.16.4 + mac_address: "40:8D:5C:BA:B9:65" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3d:93:0f" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:07:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:07:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:07:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: softiron-1 + node: &nodeparams_b + type: baremetal + vendor: American Megatrends Inc + model: Overdrive/Supercharger + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 8 + memory: 32G + disks: &disks_b + # dev/sda + - name: 'disk1' + disk_capacity: 128G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + # /dev/sdb + - name: 'disk2' + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.16.5 + mac_address: "E0:FF:F7:00:04:21" + interfaces: + # eth0, Connected, used only for admin/PXE + - mac_address: "e0:ff:f7:00:05:96" + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected, trunk for all other VLANs + - mac_address: "e0:ff:f7:00:05:97" + speed: 1gb + features: '' + name: 'nic2' + ############################################################################ + - name: softiron-2 + node: *nodeparams_b + disks: *disks_b + remote_management: + <<: *remote_params + address: 10.0.16.6 + mac_address: "E0:FF:F7:00:04:29" + interfaces: + # eth0, Connected, used only for admin/PXE + - mac_address: "e0:ff:f7:00:05:93" + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected, trunk for all other VLANs + - mac_address: "e0:ff:f7:00:05:94" + speed: 1gb + features: '' + name: 'nic2' diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml index 8c358a9c..187f42ce 100644 --- a/labs/bii/idf-pod1.yaml +++ b/labs/bii/idf-pod1.yaml @@ -1,33 +1,71 @@ +############################################################################## +# Copyright (c) 2018 BII-CFIEC 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 +############################################################################## --- ### This is a BII POD1 Installer descriptor file ### idf: version: 0.1 net_config: + oob: # IPMI management network + interface: 0 + ip-range: 192.168.20.200-192.168.20.205 + vlan: native admin: interface: 0 - vlan: 0 + vlan: native 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 + interface: 2 vlan: 101 network: 192.168.101.0 mask: 24 private: - interface: 0 - vlan: 103 - network: 192.168.103.0 + interface: 3 + vlan: 102 + network: 192.168.102.0 mask: 24 public: interface: 1 - vlan: 0 + vlan: native network: 192.168.20.0 mask: 24 + gateway: 192.168.20.1 + dns: + - 114.114.114.114 + - 8.8.8.8 + fuel: + jumphost: + bridges: + admin: 'br-pxe' + mgmt: 'br-ctl' + private: ~ + public: ~ + 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 + - 'eno1' + - 'eno2' + - 'eno3' + - 'eno4' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:01:00.1' + - '0000:02:00.0' + - '0000:02:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml index 117721b6..44eedc37 100644 --- a/labs/bii/pod1.yaml +++ b/labs/bii/pod1.yaml @@ -1,7 +1,15 @@ -### This is a BII POD1 descriptor file ### +############################################################################## +# Copyright (c) 2018 BII-CFIEC 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 +############################################################################## --- +### This is a BII POD1 descriptor file ### + details: - pod_owner: ylong@BII + pod_owner: ylong contact: ylong@biigroup.cn, zjtang@biigroup.cn lab: BII Pharos LAB location: BDA, Beijing, China @@ -11,158 +19,232 @@ details: jumphost: name: fuel node: - type: baremetal # can be virtual or baremetal + type: baremetal vendor: Dell Inc. model: powerEdge 720 arch: x86_64 cpus: 2 - cpu_cflags: haswell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads + cpu_cflags: haswell + cores: 4 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 + disks: + - name: 'disk1' + disk_capacity: 1100G 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 + os: ubuntu-16.04 remote_params: &remote_params type: ipmi versions: - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAUnK7YuVSij4ALxIM+562DzeMEk0TaCoAOAcq + vHfnXEGI6IVpLtA/5d8y+tcmy82azpcNAIRvIGT08iEPwxo/Sa8MIIB1QFd5 + mC2I+pMhbowXmCUlU3m7gxDvsOYVkUYfxswtQoKUFSnG2mAZQA8L2Vpfbc2V + fWOOQlsNuJ4g7eN22bpODUDi5XzdFuBNUhRYNGQwGre4OUM6Qb+5QyXN8hKA + rHo7bI+36WWQSTdZHKXr9sJviQsWqAYXDRNIthdUbb8FlkAUdtV65eUB36hB + 7KEjbjK8aMpsQIIOjCmc/LONIFzkrKC2nGWP83iG++aWnoXW+hHSO9bGhfrt + 41I3JjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+t7WDS6WRtLT3UTTx + wXGCgBBrhvF5qjnbDl55TN2fhb2k] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAtsyAgyyRp3U3uMkyG0tHSW0e1y7Qq3LCpIRs + E0K6745xTmVPMLzbL+8OpgBIieLFukZnWNoLtdoEfZlYbw4En5DSMpkkmWgi + 35329Bs2eIU4lNUtjFi6UvHMB+j+gvVpObRgn1EfC2ngbgognw94+aA2LBiZ + oWKIk7iRmtLTguZLd72mdV+a/Ukk7lMeYz4OF4c4myMZzk4c1F9L3VLYux0+ + xcbZw/WRZHgYg1YHONX2WNHTf91cyd282BG7rLNaY4mO7XWU9mpmqeWHjJ7N + fpwPEfwt8dJq2b+p0o1FDRyAEF375AmMfwqupDk33fecFj6elr4EMzeusrFh + RiV9wjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBABjHF90Ke9WX+NZGzZ + MUPLgBDJhm3lONPvX22d5DFMpoXy] remote_management: <<: *remote_params - address: 192.168.20.200 + address: 192.168.20.200/24 mac_address: "44:A8:42:1A:68:78" - interfaces: # physical interface list - - mac_address: "44:a8:42:15:10:03" - address: 10.20.0.2 - name: 'nic1' - - mac_address: "44:a8:42:15:10:04" - address: 192.168.20.5 - name: 'nic2' -################################################### + interfaces: + - name: 'nic1' + address: 10.10.0.2/24 + mac_address: "44:a8:42:15:10:03" + vlan: native + - name: 'nic2' + address: 192.168.20.5/24 + mac_address: "44:a8:42:15:10:04" + vlan: native + - name: 'nic3' + address: 192.168.101.2/24 + mac_address: "44:a8:42:15:10:05" + vlan: 101 + - name: 'nic4' + mac_address: "44:a8:42:15:10:06" nodes: - - name: compute1 + - name: pod1-ctl01 node: &nodeparas type: baremetal vendor: Dell Inc. model: powerEdge 720 arch: x86_64 cpus: 2 - cpu_cflags: haswell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads + cpu_cflags: haswell + cores: 4 memory: 32G - disks: &disks_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 + disks: &disks_A + - name: 'disk1' + disk_capacity: 128G + disk_type: ssd disk_interface: sas disk_rotation: 15000 - - name: 'disk5' # fifth disk - disk_capacity: 600G + - name: 'disk2' + disk_capacity: 2400G 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 - - mac_address: "44:a8:42:14:ee:64" - address: 10.20.0.4 - name: 'nic1' - ######################################## - - name: compute2 + address: 192.168.20.203/24 + mac_address: "44:A8:42:1A:49:A5" + interfaces: + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.16/24 + mac_address: "44:a8:42:14:cd:0d" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.16/24 + mac_address: "44:a8:42:14:cd:0e" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.16/24 + mac_address: "44:a8:42:14:cd:0f" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:cd:10" + - name: pod1-ctl02 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.202 - mac_address: "44:A8:42:1A:76:26" + address: 192.168.20.204/24 + mac_address: "44:A8:42:1A:76:2C" interfaces: - - mac_address: "44:a8:42:14:cb:31" - address: 10.20.0.5 - name: 'nic1' - ######################################## - - name: controller1 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.17/24 + mac_address: "44:a8:42:15:1b:e6" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.17/24 + mac_address: "44:a8:42:15:1b:e7" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.16/24 + mac_address: "44:a8:42:15:1b:e8" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:15:1b:e9" + - name: pod1-ctl03 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.203 - mac_address: "44:A8:42:1A:49:A5" + address: 192.168.20.205/24 + mac_address: "44:A8:42:13:D5:1B" interfaces: - - mac_address: "44:a8:42:14:cd:0d" - address: 10.20.0.6 - name: 'nic1' - - mac_address: "44:a8:42:14:cd:0e" - address: 192.168.20.12 - name: 'nic2' - ######################################## - - name: controller2 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.18/24 + mac_address: "44:a8:42:14:fc:1a" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.18/24 + mac_address: "44:a8:42:14:fc:1b" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.18/24 + mac_address: "44:a8:42:14:fc:1c" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:fc:1d" + - name: pod1-cmp01 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.204 - mac_address: "44:A8:42:1A:76:2C" + address: 192.168.20.201/24 + mac_address: "44:A8:42:1A:70:BE" interfaces: - - mac_address: "44:a8:42:15:1b:e6" - address: 10.20.0.7 - name: 'nic1' - - mac_address: "44:a8:42:15:1b:e7" - address: 192.168.20.13 - name: 'nic2' - ######################################## - - name: controller3 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.14/24 + mac_address: "44:a8:42:14:ee:64" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.14/24 + mac_address: "44:a8:42:14:ee:65" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.14/24 + mac_address: "44:a8:42:14:ee:66" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:ee:67" + vlan: 102 + - name: pod1-cmp02 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.205 - mac_address: "44:A8:42:13:D5:1B" + address: 192.168.20.202/24 + mac_address: "44:A8:42:1A:76:26" interfaces: - - mac_address: "44:a8:42:14:fc:1a" - address: 10.20.0.8 - name: 'nic1' - - mac_address: "44:a8:42:14:fc:1b" - address: 192.168.20.14 - name: 'nic2' + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.13/24 + mac_address: "44:a8:42:14:cb:31" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.13/24 + mac_address: "44:a8:42:14:cb:32" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.13/24 + mac_address: "44:a8:42:14:cb:33" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:cb:34" + vlan: 102 diff --git a/labs/nokia/pod1.yaml b/labs/nokia/pod1.yaml new file mode 100644 index 00000000..037d4f97 --- /dev/null +++ b/labs/nokia/pod1.yaml @@ -0,0 +1,243 @@ +############################################################################## +# Copyright (c) 2018 Nokia, 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 +############################################################################## +--- +### Nokia POD descriptor file ### + +details: + pod_owner: Mika Rautakumpu + contact: opnfv-public-lab-admin@list.nokia.com + lab: Nokia Pharos Lab + location: Espoo, Finland + type: development + link: https://wiki.opnfv.org/display/pharos/Nokia+Hosting +########################################################### + +jumphost: + name: nokiapod-jumpserver + node: &nodeparamscomp + type: baremetal + vendor: Intel + model: E5-2680 + arch: x86_64 + cpus: 2 + cpu_cflags: broadwell + cores: 14 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk2' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: centos-7 + remote_params: &remote_params + type: ipmi + versions: + - 1.0 + - 2.0 + user: admin + pass: admin + remote_management: + <<: *remote_params + address: 192.168.1.10 + mac_address: "54:ab:3a:14:11:e9" + interfaces: + - mac_address: "90:e2:ba:b0:b6:4d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:b6:4c" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:99:06" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:99:05" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:14:11:e8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:14:11:e7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' +#################################################### +nodes: + - name: nokiapod-node1 + node: &nodeparams + type: baremetal + vendor: Intel + model: E5-2630 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 8 + memory: 64G + disks: &diskscont + - name: 'disk1' + disk_capacity: 800GB + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk3' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 192.168.1.20 + mac_address: "54:ab:3a:29:18:38" + interfaces: + - mac_address: "54:ab:3a:24:3b:e2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:3b:e1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:29:18:37" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:29:18:36" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node2 + node: *nodeparams + disks: *diskscont + remote_management: + <<: *remote_params + address: 192.168.1.21 + mac_address: "54:ab:3a:16:84:45" + interfaces: + - mac_address: "54:ab:3a:24:3f:ac" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:3f:ab" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:16:84:44" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:16:84:43" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node3 + node: *nodeparams + disks: *diskscont + remote_management: + <<: *remote_params + address: 192.168.1.22 + mac_address: "54:ab:3a:16:84:6f" + interfaces: + - mac_address: "54:ab:3a:24:41:be" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:41:bd" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:16:84:6e" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:16:84:6d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node4 + node: *nodeparamscomp + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.30 + mac_address: "54:ab:3a:13:72:9c" + interfaces: + - mac_address: "90:e2:ba:b0:f2:3d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:f2:3c" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:8b:84" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:8b:83" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:13:72:9b" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:13:72:9a" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node5 + node: *nodeparamscomp + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.31 + mac_address: "54:ab:3a:13:71:94" + interfaces: + - mac_address: "90:e2:ba:b0:a6:e5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:a6:e4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:94:ea" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:94:e9" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:13:71:93" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:13:71:92" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' |