summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index ec8e4f594..1b4dd95c8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -377,7 +377,7 @@ done
virtual_repos_pkgs=${virtual_repos_pkgs%^}
# Expand reclass and virsh network templates
-for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \
+for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-arch-common/opnfv/"*.template \
net_*.template; do
eval "cat <<-EOF
$(<"${tp}")
@@ -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