##############################################################################
- # 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
{%- set nodes_num = conf['nodes'] | length -%}
{%- set networks = {} -%}
{%- for key in mapping -%}
- {%- set net_data = conf['net_config'][mapping[key]] -%}
+ {%- set net_data = conf.idf.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] -%}
##############################################################################
- # 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
{% 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'
+ ##############################################################################
+ # 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.net_config is defined -%}
- {%- set net_admin = conf.net_config.admin.network -%}
- {%- set net_mgmt = conf.net_config.mgmt.network -%}
- {%- set net_private = conf.net_config.private.network -%}
- {%- set net_public = conf.net_config.public.network -%}
- {%- set vlan_mgmt = conf.net_config.mgmt.vlan -%}
- {%- set vlan_private = conf.net_config.private.vlan -%}
- {%- if conf.net_config.public.dns is defined -%}
- {%- set dns_public = conf.net_config.public.dns -%}
+ {%- if conf.idf.net_config is defined -%}
+ {%- set net_admin = conf.idf.net_config.admin.network -%}
+ {%- 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 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 -%}
+ {%- set dns_public = conf.idf.net_config.public.dns -%}
{%- endif -%}
- {%- set pxe_interface = conf.net_config.admin.interface -%}
- {%- if conf.net_config.public.gateway is defined -%}
- {%- set net_public_gw = conf.net_config.public.gateway -%}
+ {%- set pxe_interface = conf.idf.net_config.admin.interface -%}
+ {%- if conf.idf.net_config.public.gateway is defined -%}
+ {%- set net_public_gw = conf.idf.net_config.public.gateway -%}
{%- endif -%}
{%- else -%}
{%- set net_admin = '192.168.11.0' -%}
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) }}
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) }}
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) }}
+ ##############################################################################
+ # 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 ###
# several disk types possible
disk_type: {hdd|ssd|cdrom|tape}
# several interface types possible
- disk_interface: {sata|sas|ssd|nvme}
+ disk_interface: {sata|sas|ssd|nvme|scsi|iscsi}
# define rotation speed of disk
disk_rotation: {5400|7200|10000|15000}
# second disk
# physical interface list
interfaces:
# first interface
- - nic: {nic#number}
+ - name: {nic#number}
# ip address of nic
address: 192.168.100.1
mac_address: "10:23:45:67:89:AC"
# vlan tag, may have multiple tags
vlan: {native|1-4095}
# second interface
- - nic: 'nic2'
+ - name: 'nic2'
address: 10.20.0.1/24
mac_address: "10:23:45:67:89:5B"
nodes:
+ ##############################################################################
+ # 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 ###
# several disk types possible
disk_type: {hdd|ssd|cdrom|tape}
# several interface types possible
- disk_interface: {sata|sas|ssd|nvme}
+ disk_interface: {sata|sas|ssd|nvme|scsi|iscsi}
# define rotation speed of disk
- disk_rotation: {5400|7200|10000|15000}
+ disk_rotation: {0|5400|7200|10000|15000}
# second disk
- name: 'disk2'
disk_capacity: 2048G
# physical interface list
interfaces:
# first interface
- - nic: {nic#number}
+ - name: {nic#number}
# ip address of nic
address: 192.168.100.1
mac_address: "10:23:45:67:89:AC"
# vlan tag, may have multiple tags
vlan: {native|1-4095}
# second interface
- - nic: 'nic2'
+ - name: 'nic2'
address: 10.20.0.1/24
mac_address: "10:23:45:67:89:5B"
nodes:
#!/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
echo "Using $(yamllint --version)"
# Build a table header, using ';' as column sep
-SUMMARY='PDF Verify Matrix;YAML Lint;'
-for adapter in ${INSTALLER_ADAPTERS}; do
+for adapter in 'PDF Verify Matrix' ${INSTALLER_ADAPTERS}; do
SUMMARY+="$(basename "${adapter}");"
done
# Iterate all PDFs, check with each installer adapter, log results
while IFS= read -r lab_config; do
- valid_yaml='OK'
- echo -e "\n###################### ${lab_config} ######################\n"
- echo -e "\n\nyamllint -s ${lab_config}"
- if ! yamllint -s "${lab_config}"; then valid_yaml='FAIL'; fi
- SUMMARY+="\n${lab_config#labs/};${valid_yaml};"
+ SUMMARY+="\n${lab_config#labs/};"
+ echo "###################### ${lab_config} ######################"
for adapter in ${INSTALLER_ADAPTERS}; do
pdf_inst=0
pdf_inst_pass=0
pdf_yaml_pass=0
while IFS= read -r jinja_template; do
- echo -e "\n${GEN_CFG} -y ${lab_config} -j ${jinja_template}"
- if "${GEN_CFG}" -y "${lab_config}" \
- -j "${jinja_template}" > "${TMPF}"; then
- echo 'Result: PASS'
+ pdf_gen_cmd="${GEN_CFG} -y ${lab_config} -j ${jinja_template}"
+ if ${pdf_gen_cmd} > "${TMPF}"; then
((pdf_inst_pass+=1))
- echo -e "\nyamllint -s ${jinja_template%.j2}"
+ echo "[GENERATE] [OK] ${pdf_gen_cmd}"
if yamllint -s <(sed 's|ENC\[PKCS.*\]|opnfv|g' "${TMPF}"); then
((pdf_yaml_pass+=1));
+ echo "[YAMLLINT] [OK] yamllint -s ${jinja_template%.j2}"
+ else
+ echo "[YAMLLINT] [ERROR] yamllint -s ${jinja_template%.j2}"
fi
else
- echo 'Result: FAIL'
+ echo "[GENERATE] [ERROR] ${pdf_gen_cmd}"
RC=1
fi
((pdf_inst+=1))
+ echo ''
done < <(find "${adapter}" -name '*.j2')
SUMMARY+="${pdf_yaml_pass}/${pdf_inst_pass}/${pdf_inst};"
done
done < <(find 'labs' -name 'pod*.yaml')
-
rm -f "${TMPF}"
-echo -e '\n\nNOTE: tuple fmt: (valid YAML output/sucessful parse/templates).\n'
-echo -e "${SUMMARY}" | sed -e 's/^/;/g' -e 's/;/;| /g' | column -t -s ';'
cat <<EOF
+###################### Result Matrix ######################
+
+NOTE: tuple fmt: (valid YAML output/sucessful parse/templates).
+
+$(echo -e "${SUMMARY}" | sed -e 's/^/;/g' -e 's/;/;| /g' | column -t -s ';')
To troubleshoot PDF parsing against a specific installer adapter,
execute the following commands locally (e.g. for zte-pod2/joid):
Code Review / pharos.git / commitdiff