Bug #1911: Now vmfs datstore drivers can clone CDROMs

This commit is contained in:
Tino Vazquez committed 2013-04-24 13:12:07 +02:00
1 parent 254f749a93
commit d3e2c0a615
1 file changed
+9 -3
+9 -3
View File
@@ -54,7 +54,8 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/DS_USE_SSH \
/DS_DRIVER_ACTION_DATA/DATASTORE/ID \
/DS_DRIVER_ACTION_DATA/IMAGE/PATH \
/DS_DRIVER_ACTION_DATA/IMAGE/ID)
/DS_DRIVER_ACTION_DATA/IMAGE/ID \
/DS_DRIVER_ACTION_DATA/IMAGE/TYPE)
BASE_PATH="${XPATH_ELEMENTS[0]}"
UMASK="${XPATH_ELEMENTS[1]}"
@@ -63,6 +64,7 @@ USE_SSH="${XPATH_ELEMENTS[3]:-$DS_USE_SSH}"
DS_ID="${XPATH_ELEMENTS[4]}"
SRC="${XPATH_ELEMENTS[5]}"
IMAGE_ID="${XPATH_ELEMENTS[6]}"
IMAGE_TYPE="${XPATH_ELEMENTS[7]}"
SRC_FOLDER=`basename $SRC`
DST=`generate_image_path`
@@ -80,8 +82,12 @@ vmfs_set_up
log "Copying local image $SRC to the image repository"
if [ "$USE_SSH" == "yes" ]; then
ssh_make_path $DST_HOST /vmfs/volumes/$DS_ID/$DST_FOLDER
ssh_exec_and_log $DST_HOST "$VMKFSTOOLS $VI_PARAMS -i /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk to /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk"
if ! is_cdrom; then
ssh_make_path $DST_HOST /vmfs/volumes/$DS_ID/$DST_FOLDER
ssh_exec_and_log $DST_HOST "$VMKFSTOOLS $VI_PARAMS -i /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER/disk.vmdk to /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk"
else
ssh_exec_and_log $DST_HOST "cp /vmfs/volumes/$DS_ID/$SRC_FOLDER /vmfs/volumes/$DS_ID/$DST_FOLDER" "Error copying /vmfs/volumes/$DS_ID/$SRC_FOLDER to /vmfs/volumes/$DS_ID/$DST_FOLDER in $DST_HOST"
fi
else
exec_and_log "vifs $VI_PARAMS --copy [$DS_ID]$SRC_FOLDER [$DS_ID]$DST_FOLDER" \
"Error copying $SRC to $DST"