shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Revert "bug #1636: Fix for VMFS TM Clone using SSH"

Browse Source 
This reverts commit 73a2e4aded827f90f577ba4947a36c0447754f8e.
This commit is contained in:
Javi Fontan 2012-11-07 15:38:22 +01:00
parent b4093f2cb8
commit b3bf623670
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tm_mad/vmfs/clone
View File

@ -65,7 +65,7 @@ vmfs_set_up
#-------------------------------------------------------------------------------
if [ "$USE_SSH" == "yes" ]; then
ssh_make_path $DST_HOST /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER
ssh_make_path $DST_HOST $DST_PATH
else
vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER
fi
@ -78,17 +78,20 @@ log "Cloning $SRC_PATH in $DST"
if [ "$USE_SSH" == "yes" ]; then
CLONESCRIPT=$(cat <<EOF
cd $DST_DIR
export PATH=/usr/sbin:/sbin:\$PATH
if which sudo > /dev/null; then
SUDO_CMD="sudo "
fi
\$SUDO_CMD $VMKFSTOOLS -U /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER/disk.vmdk
\$SUDO_CMD $VMKFSTOOLS -i /vmfs/volumes/$IMAGE_DS_NAME/$SRC_FOLDER/disk.vmdk -d thin /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER/disk.vmdk
\$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
EOF
)
ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST"
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
@ -98,9 +101,8 @@ else
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" \
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"
fi
exit 0