-OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
-OPNFV_FUEL_DIR="/root/fuel"
-OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common"
-LOCAL_PDF_RECLASS=$1
+F_GIT_DIR=$(cd "${F_GIT_ROOT}/mcp" && git rev-parse --git-dir)
+F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}}
+OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
+OPNFV_GIT_DIR="/root/opnfv"
+OPNFV_FUEL_DIR="/root/fuel" # Should be in sync with patch.sh, scripts patches
+OPNFV_RDIR="reclass/classes/cluster/all-mcp-arch-common"
+OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img"
+OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images"
+LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}"
+LOCAL_PDF_RECLASS=$1; shift
+# shellcheck disable=SC2116,SC2086
+LOCAL_VIRT_NODES=$(echo ${*//cfg01/}) # unquoted to filter space
+NODE_MASK="${LOCAL_VIRT_NODES// /|}"