shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-04 17:47:00 +03:00
Code Releases Wiki Activity

feature #1437: Add log info, fix context for vmfs

Browse Source
This commit is contained in:
Tino Vazquez 2012-09-21 15:11:02 +02:00
parent 6281564810
commit fb8de1f49b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tm_mad/vmfs/context
View File

@ -88,11 +88,11 @@ done
exec_and_log "$MKISOFS -o $ISO_FILE -J -R $ISO_DIR" "Error creating iso fs"
if [ "$USE_SSH" == "yes" ]; then
exec_and_log "$SCP $ISO_FILE $DST" "Error copying context ISO to $DST"
exec_and_log "$SCP $ISO_FILE $DST_PATH.iso" "Error copying context ISO to $DST"
else
# Copies the iso file with .iso suffix, needed for VMware CDROMs
exec_and_log "vifs $VI_PARAMS -p $ISO_FILE $DST_PATH.iso" \
"Error copying context ISO to $DST"
exec_and_log "vifs $VI_PARAMS -p $ISO_FILE [$DS_ID]$VM_ID/$DST_FOLDER.iso" \
"Error copying context ISO to [$DS_ID]$VM_ID/$DST_FOLDER.iso in $DST_HOST"
fi
rm -rf $ISO_DIR > /dev/null 2>&1

4
src/tm_mad/vmfs/mvds
View File

@ -68,6 +68,8 @@ fi
# Move the image back to the datastore
#-------------------------------------------------------------------------------
log "Moving [$SYSTEM_DS_NAME]$VMID/$SRC_FOLDER/disk.vmdk to [$IMAGE_DS_NAME]$DST_FOLDER/disk.vmdk"
if [ "$USE_SSH" == "yes" ]; then
MVSCRIPT=$(cat <<EOF
@ -95,8 +97,6 @@ fi
EOF
)
log "Moving $SRC_PATH to datastore as $DST_PATH"
ssh_exec_and_log $SRC_HOST "$MVSCRIPT" "Could not move image [$SYSTEM_DS_NAME]$VMID/$SRC_FOLDER/disk.vmdk to [$IMAGE_DS_NAME]$DST_FOLDER/disk.vmdk in $SRC_HOST"
else
$VMKFSTOOLS $VI_PARAMS -U [$IMAGE_DS_NAME]$DST_FOLDER/disk.vmdk &> /dev/null