mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
feature #1437: Polishing vmfs ssh drivers
This commit is contained in:
parent
e1c1ff0f9e
commit
10930165bf
@ -142,7 +142,7 @@ fi
|
||||
|
||||
# Make the final hop, front-end -> VMFS Datastore
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
exec_and_log "$SCP -r $SRC $DST" "Error copying $SRC to $DST through SCP"
|
||||
exec_and_log "$SCP -r $SRC $DST_HOST:$DST" "Error copying $SRC to $DST through SCP"
|
||||
else
|
||||
cd $SRC
|
||||
for file in $(find . -type f); do
|
||||
|
@ -94,8 +94,8 @@ VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
ssh_exec_and_log $DST_HOST "mkdir -p /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER" \
|
||||
"Could not create disk directory /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER on $DST_HOST"
|
||||
ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk"
|
||||
ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk" \
|
||||
$SSH $DST_HOST $VMKFSTOOLS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk
|
||||
ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER/disk.vmdk" \
|
||||
"Cannot create [$IMAGE_DS_ID] $DST_FOLDER/disk.vmdk on $DST_HOST"
|
||||
else
|
||||
$VMKFSTOOLS $VI_PARAMS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk &> /dev/null
|
||||
|
@ -46,7 +46,6 @@ source $(dirname $0)/tm_vmwarerc
|
||||
# Set dst path and dir
|
||||
#-------------------------------------------------------------------------------
|
||||
SRC_PATH=`arg_path $SRC`
|
||||
SRC_PATH="../../${SRC_PATH##"$DS_DIR/"}"
|
||||
SRC_FOLDER=`basename $SRC_PATH`
|
||||
|
||||
DST_PATH=`arg_path $DST`
|
||||
|
Loading…
x
Reference in New Issue
Block a user