Use just IMAGE_PREFIX, not IMAGE_PREFIX+"one"
This commit is contained in:
@@ -57,7 +57,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
|
||||
SRC="${XPATH_ELEMENTS[j++]}"
|
||||
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||
|
||||
CLI=vitastor-cli
|
||||
@@ -65,7 +65,7 @@ if [ `is_disk $DST_PATH` -eq 0 ]; then
|
||||
CLI="$CLI --config_path ${VITASTOR_CONF}"
|
||||
fi
|
||||
|
||||
SRC_CHECKPOINT="${IMAGE_PREFIX}one-sys-${VM_ID}-checkpoint"
|
||||
SRC_CHECKPOINT="${IMAGE_PREFIX}-sys-${VM_ID}-checkpoint"
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$CLI rm $SRC_CHECKPOINT 2>/dev/null || exit 0" \
|
||||
"Error deleting $SRC_CHECKPOINT in $DST_HOST"
|
||||
@@ -95,7 +95,7 @@ done < <(onevm show -x $VM_ID | $XPATH \
|
||||
SRC="${XPATH_ELEMENTS[j++]}"
|
||||
CLONE="${XPATH_ELEMENTS[j++]}"
|
||||
VITASTOR_CONF="${XPATH_ELEMENTS[j++]}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[j++]:-one}"
|
||||
POOL_NAME="${XPATH_ELEMENTS[j++]}"
|
||||
|
||||
if is_undeployed "$VM_ID" "$DST_HOST"; then
|
||||
@@ -124,7 +124,7 @@ if [ -n "$SRC" ]; then
|
||||
SRC_IMAGE="${SRC}-${VM_ID}-${DISK_ID}"
|
||||
else
|
||||
# volatile
|
||||
SRC_IMAGE="${IMAGE_PREFIX}one-sys-${VM_ID}-${DISK_ID}"
|
||||
SRC_IMAGE="${IMAGE_PREFIX}-sys-${VM_ID}-${DISK_ID}"
|
||||
fi
|
||||
|
||||
# Delete the image
|
||||
|
||||
Reference in New Issue
Block a user