aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-28 20:27:05 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-04 14:27:21 +0100
commit09dce2a2643223d66aa1ac3a0ad8feebc082f521 (patch)
tree018fa3b05ca8e93fd7870f9edda3ba20ef61f0d7 /ci
parent81ee9b180ab11507492783aa1d62927faa9876df (diff)
Rename reclass models to add "-ha" or "-noha"
Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 10703f3c0..c93adc657 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -386,9 +386,7 @@ done
# Convert Pharos-compatible PDF to reclass network definitions
if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then
- find "${RECLASS_CLUSTER_DIR}/${CLUSTER_DOMAIN%.local}" \
- "${RECLASS_CLUSTER_DIR}/${DEPLOY_TYPE}-mcp-ocata-common" \
- -name '*.j2' | while read -r tp
+ find "${RECLASS_CLUSTER_DIR}" -name '*.j2' | while read -r tp
do
if ! "${PHAROS_GEN_CONFIG_SCRIPT}" -y "${LOCAL_PDF}" \
-j "${tp}" > "${tp%.j2}"; then