docker build, deploy: Switch tooling to python3

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

diff --git a/mcp/scripts/lib_template.sh b/mcp/scripts/lib_template.sh
index daa0444..822d141 100644 (file)
--- a/mcp/scripts/lib_template.sh
+++ b/mcp/scripts/lib_template.sh
@@ -31,9 +31,6 @@ function do_templates_scenario {
   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)!"
@@ -50,22 +47,22 @@ 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
-    notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!"
-  fi
   printenv | \
     awk '/^(SALT|MCP|MAAS).*=/ { gsub(/=/,": "); print }' >> "${LOCAL_PDF}"
   j2args=$(find "${scenario_dir}" -name '*.j2' -exec echo -j {} \;)
   # shellcheck disable=SC2086
-  if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" ${j2args} -b -v \
+  if ! python3 "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" ${j2args} -b -v \
     -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
+  if ! python3 "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \
+    -i "$(dirname "$(readlink -f "${PHAROS_IA}")")" \
+    -j "${PHAROS_IA}" -v > "${image_dir}/pod_config.yml"; then
+    notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!"
+  fi
 }
 
 # Expand reclass and virsh network templates based on PDF + IDF + others
@@ -87,7 +84,7 @@ function do_templates_cluster {
            "$(readlink -f docker-compose)" $(readlink -f ./*j2) \
            -name '*.j2' -exec echo -j {} \;)
   # shellcheck disable=SC2086
-  if ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" ${j2args} -b -v \
+  if ! python3 "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" ${j2args} -b -v \
     -i "$(dirname "$(readlink -f "${PHAROS_IA}")")"; then
     notify_e '[ERROR] Could not convert PDF to network definitions!'
   fi