[baremetal] Containerize MaaS

[fuel.git] / mcp / scripts / lib_template.sh

diff --git a/mcp/scripts/lib_template.sh b/mcp/scripts/lib_template.sh
index 0cfc02f..980827c 100644 (file)
--- a/mcp/scripts/lib_template.sh
+++ b/mcp/scripts/lib_template.sh
@@ -23,16 +23,14 @@ function do_templates_scenario {
   local target_lab=$1; shift
   local target_pod=$1; shift
   local lab_config_uri=$1; shift
-  local scenario_dir=$1
+  local scenario_dir=$1; shift
+  local extra_yaml=("$@")
 
   BASE_CONFIG_PDF="${lab_config_uri}/labs/${target_lab}/${target_pod}.yaml"
   BASE_CONFIG_IDF="${lab_config_uri}/labs/${target_lab}/idf-${target_pod}.yaml"
   LOCAL_PDF="${image_dir}/$(basename "${BASE_CONFIG_PDF}")"
   LOCAL_IDF="${image_dir}/$(basename "${BASE_CONFIG_IDF}")"
 
-  # Make sample PDF/IDF available via default lab-config (pharos submodule)
-  ln -sf "$(readlink -f "../config/labs/local")" "./pharos/labs/"
-
   # Expand scenario file and main reclass input (pod_config.yaml) based on PDF
   if ! curl --create-dirs -o "${LOCAL_PDF}" "${BASE_CONFIG_PDF}"; then
     notify_e "[ERROR] Could not retrieve PDF (Pod Descriptor File)!"
@@ -49,6 +47,9 @@ 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