Use just IMAGE_PREFIX, not IMAGE_PREFIX+"one"
This commit is contained in:
@@ -38,7 +38,6 @@ done < <($XPATH \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/IMAGE_PREFIX \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/FORMAT \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/FS \
|
||||
@@ -51,8 +50,7 @@ RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||
SAFE_DIRS="${XPATH_ELEMENTS[i++]}"
|
||||
BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
|
||||
POOL_NAME="${XPATH_ELEMENTS[i++]}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]}"
|
||||
STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
|
||||
IMAGE_PREFIX="${XPATH_ELEMENTS[i++]:-one}"
|
||||
FORMAT="${XPATH_ELEMENTS[i++]}"
|
||||
SIZE="${XPATH_ELEMENTS[i++]}"
|
||||
FS="${XPATH_ELEMENTS[i++]}"
|
||||
@@ -75,7 +73,7 @@ fi
|
||||
|
||||
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
|
||||
|
||||
IMAGE_NAME="${IMAGE_PREFIX}one-${ID}"
|
||||
IMAGE_NAME="${IMAGE_PREFIX}-${ID}"
|
||||
|
||||
# ------------ Image to save_as disk, no need to create a new image ------------
|
||||
|
||||
@@ -109,7 +107,6 @@ if [ ! -z $FS ]; then
|
||||
set -e -o pipefail
|
||||
|
||||
IMAGE_HASH=`generate_image_hash`
|
||||
TMP_DST="$STAGING_DIR/$IMAGE_HASH"
|
||||
FS_OPTS=$(eval $(echo "echo \$FS_OPTS_$FS"))
|
||||
|
||||
MKFS_CMD=`mkfs_command '$NBD' raw "$SIZE" "$SUPPORTED_FS" "$FS" "$FS_OPTS" | grep -v $QEMU_IMG`
|
||||
|
||||
Reference in New Issue
Block a user