diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-05-06 13:32:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-06 13:32:24 +0000 |
| commit | 6fc9ea86375b3fafba3de494ba32a4c65f39ca93 (patch) | |
| tree | f3b838cf95b8e36cc5bd5d2f4eb60f00dc68795d /mcp/scripts/lib_template.sh | |
| parent | 7522bdb0e898144da2b6dc361dbdd549b39bc025 (diff) | |
| parent | 9e5b19768d6eb9b32564240065ecba6c791cac12 (diff) | |
Merge "[virtual] Parameterize scenarios based on PDF/IDF"
Diffstat (limited to 'mcp/scripts/lib_template.sh')
| -rw-r--r-- | mcp/scripts/lib_template.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mcp/scripts/lib_template.sh b/mcp/scripts/lib_template.sh index 980827c7a..b44702235 100644 --- a/mcp/scripts/lib_template.sh +++ b/mcp/scripts/lib_template.sh @@ -47,9 +47,6 @@ function do_templates_scenario { notify_e "[ERROR] IDF does not match yaml schema!" fi fi - for _yaml in "${extra_yaml[@]}"; do - awk '/^---$/{f=1;next;}f' "${_yaml}" >> "${LOCAL_PDF}" - done if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \ -i "$(dirname "$(readlink -f "${PHAROS_IA}")")" \ -j "${PHAROS_IA}" -v > "${image_dir}/pod_config.yml"; then @@ -63,6 +60,9 @@ function do_templates_scenario { -i "$(dirname "$(readlink -f "${PHAROS_IA}")")"; then notify_e '[ERROR] Could not convert j2 scenario definitions!' fi + for _yaml in "${extra_yaml[@]}"; do + awk '/^---$/{f=1;next;}f' "${_yaml}" >> "${LOCAL_PDF}" + done } # Expand reclass and virsh network templates based on PDF + IDF + others |