From 09dce2a2643223d66aa1ac3a0ad8feebc082f521 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 28 Nov 2017 20:27:05 +0100 Subject: 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 --- ci/deploy.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ci') 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 -- cgit 1.2.3-korg