mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
Bug #1911: vmfs drivers now support CDROM images
This commit is contained in:
1 parent
c0aca24603
commit
09fc9ca02e
4 files changed
+105
-31
No files matched your search
@@ -62,6 +62,7 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/ID \
|
||||
/DS_DRIVER_ACTION_DATA/IMAGE/TYPE \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
|
||||
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
|
||||
|
||||
@@ -77,8 +78,9 @@ SRC="${XPATH_ELEMENTS[8]}"
|
||||
MD5="${XPATH_ELEMENTS[9]}"
|
||||
SHA1="${XPATH_ELEMENTS[10]}"
|
||||
IMAGE_ID="${XPATH_ELEMENTS[11]}"
|
||||
NO_DECOMPRESS="${XPATH_ELEMENTS[12]}"
|
||||
LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[13]}"
|
||||
IMAGE_TYPE="${XPATH_ELEMENTS[12]}"
|
||||
NO_DECOMPRESS="${XPATH_ELEMENTS[13]}"
|
||||
LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[14]}"
|
||||
|
||||
FE_DST=`generate_image_path`
|
||||
DST_FOLDER=`basename $FE_DST`
|
||||
@@ -92,7 +94,9 @@ set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
|
||||
|
||||
vmfs_set_up
|
||||
|
||||
vmfs_create_remote_path $DS_ID
|
||||
if ! is_cdrom; then
|
||||
vmfs_create_remote_path $DS_ID
|
||||
fi
|
||||
|
||||
# ------------ Prepare for a possible download in the front-end -------------
|
||||
|
||||
@@ -124,7 +128,7 @@ http://*|https://* )
|
||||
|
||||
log "Copying local disk folder $SRC to the image repository"
|
||||
|
||||
if [ ! -d $SRC ]; then
|
||||
if [ ! -d $SRC -a ! is_cdrom ]; then
|
||||
exec_and_log "$COPY_COMMAND" "Error copying $SRC to $TMP_DIR/$DST_FOLDER"
|
||||
SRC="$TMP_DIR/$DST_FOLDER"
|
||||
fi
|
||||
@@ -132,7 +136,7 @@ http://*|https://* )
|
||||
esac
|
||||
|
||||
# Rename the disk filename to disk.vmdk (warning: it does so in SRC)
|
||||
if [ ! -f $SRC/disk.vmdk ]; then
|
||||
if [ -d "$SRC" -a ! -f "$SRC/disk.vmdk" ]; then
|
||||
BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
|
||||
|
||||
exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \
|
||||
@@ -141,14 +145,24 @@ fi
|
||||
|
||||
# Make the final hop, front-end -> VMFS Datastore
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
exec_and_log "$SCP -r $SRC/* $DST_HOST:$DST" "Error copying $SRC to $DST through SCP"
|
||||
if ! is_cdrom; then
|
||||
exec_and_log "$SCP -r $SRC/* $DST_HOST:$DST" "Error copying $SRC to $DST through SCP"
|
||||
else
|
||||
exec_and_log "$SCP $SRC $DST_HOST:$DST" "Error copying $SRC to $DST through SCP"
|
||||
fi
|
||||
else
|
||||
cd $SRC
|
||||
for file in $(find . -type f); do
|
||||
FNAME=$(basename $file)
|
||||
exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \
|
||||
"Cannot upload $file to $DST/$FNAME on $DST_HOST"
|
||||
done
|
||||
if ! is_cdrom; then
|
||||
cd $SRC
|
||||
for file in $(find . -type f); do
|
||||
FNAME=$(basename $file)
|
||||
exec_and_log "vifs $VI_PARAMS -p $file [$DS_ID]$DST_FOLDER/$FNAME" \
|
||||
"Cannot upload $file to $DST/$FNAME on $DST_HOST"
|
||||
done
|
||||
else # Type CDROM
|
||||
FILE_TO_REGISTER=$(basename $DST)
|
||||
exec_and_log "vifs $VI_PARAMS -p $SRC [$DS_ID]$FILE_TO_REGISTER" \
|
||||
"Cannot upload $SRC to $DST on $DST_HOST"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d "$TMP_DIR/$DST_FOLDER" -a -n "$DST_FOLDER" ]; then
|
||||
|
||||
@@ -101,3 +101,8 @@ function get_tm_use_ssh {
|
||||
|
||||
echo $TM_USE_SSH
|
||||
}
|
||||
|
||||
# Checks wether $IMAGE_TYPE is CDROM
|
||||
function is_cdrom {
|
||||
[ "$IMAGE_TYPE" = "1" ]
|
||||
}
|
||||
+44
-15
@@ -54,6 +54,20 @@ IMAGE_DS_NAME=`basename $(dirname $SRC_PATH)`
|
||||
SYSTEM_DS_NAME=`basename $(dirname $(dirname $DST_PATH))`
|
||||
USE_SSH=$(get_tm_use_ssh $IMAGE_DS_NAME)
|
||||
|
||||
# Let's check if it is a CDROM
|
||||
DISK_ID=$(echo "$DST_PATH" | $AWK -F. '{print $NF}')
|
||||
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||
DRIVER_PATH=$(dirname $0)
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
||||
while IFS= read -r -d '' element; do
|
||||
XPATH_ELEMENTS[i++]="$element"
|
||||
done < <(onevm show -x $VMID| $XPATH \
|
||||
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
|
||||
|
||||
DISK_TYPE="${XPATH_ELEMENTS[0]}"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Set up datastore
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -64,10 +78,12 @@ vmfs_set_up
|
||||
# Create remote folder
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
ssh_make_path $DST_HOST $DST_PATH
|
||||
else
|
||||
vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER
|
||||
if [ "$DISK_TYPE" != "CDROM"]; then
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
ssh_make_path $DST_HOST $DST_PATH
|
||||
else
|
||||
vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER
|
||||
fi
|
||||
fi
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
@@ -86,23 +102,36 @@ if which sudo > /dev/null; then
|
||||
SUDO_CMD="sudo "
|
||||
fi
|
||||
|
||||
\$SUDO_CMD $VMKFSTOOLS -U $DST_PATH/disk.vmdk
|
||||
\$SUDO rm $DST_PATH/*
|
||||
\$SUDO_CMD $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk
|
||||
if [ "$DISK_TYPE" != "CDROM" ]; then
|
||||
\$SUDO_CMD $VMKFSTOOLS -U $DST_PATH/disk.vmdk
|
||||
\$SUDO rm $DST_PATH/*
|
||||
\$SUDO_CMD $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk
|
||||
else
|
||||
\$SUDO rm $DST_PATH
|
||||
\$SUDO cp $SRC_PATH $DST_PATH
|
||||
\$SUDO ln -s $DST_PATH $DST_PATH.iso
|
||||
fi
|
||||
|
||||
EOF
|
||||
)
|
||||
ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST"
|
||||
else
|
||||
$VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null
|
||||
if [ "$DISK_TYPE" != "CDROM"]; then
|
||||
$VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null
|
||||
|
||||
# Erase in case that vmkfstool didn't recognize the disk
|
||||
FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
|
||||
for file in $FILES_TO_ERASE; do
|
||||
vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/$file
|
||||
done
|
||||
# Erase in case that vmkfstool didn't recognize the disk
|
||||
FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
|
||||
for file in $FILES_TO_ERASE; do
|
||||
vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/$file
|
||||
done
|
||||
|
||||
exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
|
||||
"Error cloning $SRC to $DST"
|
||||
exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
|
||||
"Error cloning $SRC to $DST"
|
||||
else
|
||||
vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_PATH &> /dev/null
|
||||
exec_and_log "vifs $VI_PARAMS -p $SRC_PATH [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso" \
|
||||
"Cannot upload $SRC_PATH to [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso on $DST_HOST"
|
||||
fi
|
||||
fi
|
||||
|
||||
exit 0
|
||||
+30
-4
@@ -59,9 +59,25 @@ USE_SSH=$(get_tm_use_ssh $DSID)
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
ssh_make_path $DST_HOST $DST_PATH
|
||||
|
||||
log "Link all files in $SRC_PATH to $DST_PATH"
|
||||
# Let's check if it is a CDROM
|
||||
DISK_ID=$(echo "$DST_PATH" | $AWK -F. '{print $NF}')
|
||||
XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
|
||||
DRIVER_PATH=$(dirname $0)
|
||||
|
||||
unset i XPATH_ELEMENTS
|
||||
|
||||
while IFS= read -r -d '' element; do
|
||||
XPATH_ELEMENTS[i++]="$element"
|
||||
done < <(onevm show -x $VMID| $XPATH \
|
||||
/VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/TYPE )
|
||||
|
||||
DISK_TYPE="${XPATH_ELEMENTS[0]}"
|
||||
|
||||
if [ "$DISK_TYPE" != "CDROM"]; then
|
||||
ssh_make_path $DST_HOST $DST_PATH
|
||||
|
||||
log "Link all files in $SRC_PATH to $DST_PATH"
|
||||
|
||||
LINK_SCRIPT=$(cat <<EOF
|
||||
for file in \$(find $SRC_PATH -type f); do
|
||||
@@ -69,8 +85,18 @@ for file in \$(find $SRC_PATH -type f); do
|
||||
done
|
||||
EOF
|
||||
)
|
||||
ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \
|
||||
"Could not link dir files from source DS to system DS"
|
||||
ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \
|
||||
"Could not link dir files from $SRC_PATH to $DST_PATH"
|
||||
else
|
||||
log "Link CD-ROM from $SRC_PATH to $DST_PATH"
|
||||
|
||||
LINK_SCRIPT=$(cat <<EOF
|
||||
ln -s $SRC_PATH $DST_PATH.iso
|
||||
EOF
|
||||
)
|
||||
ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \
|
||||
"Could not link CDROM ISO file from $SRC_PATH to system $DST_PATH"
|
||||
fi
|
||||
else
|
||||
log "Cannot link files without SSH enabled on the ESX hosts, calling clone"
|
||||
exec $(dirname $0)/clone $*
|
||||
|
||||
Reference in new issue
Block a user