diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-28 20:27:05 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-31 02:11:34 +0100 |
| commit | f30d534e080a43aed078b7aadbc4db9dab95dcf6 (patch) | |
| tree | 7d01b418ed0ea2b327b8ad63acb3ef9c08e3a4f9 /ci | |
| parent | 565454013b305e6a95b103a37351478c0090bb6b (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>
(cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index bf6b6be0f..fd3911d08 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -368,9 +368,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 |