mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
feature #2097: Fix paths and remove sudo from TM MAD vmfs
(cherry picked from commit 6620b0a086)
This commit is contained in:
1 parent
be3e12e6a2
commit
0ab791391f
5 files changed
+45
-37
No files matched your search
+20
-17
@@ -93,39 +93,42 @@ cd $DST_DIR
|
||||
|
||||
export PATH=/usr/sbin:/sbin:\$PATH
|
||||
|
||||
if which sudo > /dev/null; then
|
||||
SUDO_CMD="sudo "
|
||||
fi
|
||||
|
||||
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
|
||||
$VMKFSTOOLS -U $DST_PATH/disk.vmdk
|
||||
rm $DST_PATH/*
|
||||
$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
|
||||
rm $DST_PATH
|
||||
cp $SRC_PATH $DST_PATH
|
||||
ln -s $DST_PATH $DST_PATH.iso
|
||||
fi
|
||||
|
||||
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
|
||||
if [ "$DISK_TYPE" != "CDROM" ]; then
|
||||
$VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null
|
||||
$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:]]*$"`
|
||||
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 -c [$IMAGE_DS_NAME]$(basename $SRC_PATH) [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso" \
|
||||
"Cannot upload [$IMAGE_DS_NAME]$(basename $SRC_PATH) to [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso on $DST_HOST"
|
||||
exec_and_log \
|
||||
"vifs $VI_PARAMS -c [$IMAGE_DS_NAME]$(basename $SRC_PATH) \
|
||||
[$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso" \
|
||||
"Cannot upload [$IMAGE_DS_NAME]$(basename $SRC_PATH) to \
|
||||
[$SYSTEM_DS_NAME]$VMID/$DST_FOLDER.iso on $DST_HOST"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -107,20 +107,21 @@ for f in "${SRC[@]}"; do
|
||||
done
|
||||
|
||||
exec_and_set_error "$MKISOFS -o $ISO_FILE -J -R $ISO_DIR" \
|
||||
"Error creating iso fs"
|
||||
"Error creating iso fs"
|
||||
[ -n "$ERROR" ] && exit_error
|
||||
|
||||
if [ "$USE_SSH" == "yes" ]; then
|
||||
exec_and_set_error "$SCP $ISO_FILE $DST_HOST:$DST_PATH.iso" "Error copying context ISO to $DST"
|
||||
exec_and_set_error "$SCP $ISO_FILE $DST_HOST:$DST_PATH.iso" \
|
||||
"Error copying context ISO to $DST"
|
||||
else
|
||||
# Copies the iso file with .iso suffix, needed for VMware CDROMs
|
||||
vifs $VI_PARAMS -f -rm [$DS_ID]$VM_ID/$DST_FOLDER.iso
|
||||
exec_and_set_error "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"
|
||||
exec_and_set_error \
|
||||
"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
|
||||
|
||||
[ -n "$ERROR" ] && exit_error
|
||||
|
||||
rm -rf $ISO_DIR > /dev/null 2>&1
|
||||
|
||||
exit 0
|
||||
+12
-9
@@ -16,8 +16,8 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
#-----------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
function vifs_rmdir {
|
||||
DIR_TO_RM="$1"
|
||||
@@ -25,7 +25,8 @@ function vifs_rmdir {
|
||||
grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"`
|
||||
|
||||
for file in $FILES_TO_ERASE; do
|
||||
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DIR_TO_RM/$file" \
|
||||
exec_and_log \
|
||||
"vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DIR_TO_RM/$file" \
|
||||
"Cannot delete [$DSID]$VMID/$DIR_TO_RM/$file in $DST_HOST"
|
||||
done
|
||||
|
||||
@@ -33,8 +34,8 @@ grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"`
|
||||
"Cannot delete [$DSID]$VMID in $DST_HOST"
|
||||
}
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
#-----------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
# DELETE <host:remote_system_ds/disk.i|host:remote_system_ds/> vmid dsid
|
||||
# - host is the target host to deploy the VM
|
||||
@@ -73,7 +74,7 @@ USE_SSH=$(get_tm_use_ssh $DSID)
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Set up datastore
|
||||
#----------------------- --------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
vmfs_set_up
|
||||
|
||||
@@ -94,11 +95,13 @@ else
|
||||
if [ "$DISK_TYPE" != "CDROM" ]; then
|
||||
vifs_rmdir $DISK_NAME
|
||||
else
|
||||
exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DISK_NAME.iso" \
|
||||
"Cannot delete [$DSID]$VMID/$DISK_NAME.iso in $DST_HOST"
|
||||
exec_and_log \
|
||||
"vifs $VI_PARAMS --force --rm [$DSID]$VMID/$DISK_NAME.iso" \
|
||||
"Cannot delete [$DSID]$VMID/$DISK_NAME.iso in $DST_HOST"
|
||||
fi
|
||||
else
|
||||
DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"`
|
||||
DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|\
|
||||
grep -v "Content Listing"|grep -Fv -- "--------"|egrep -v "^[[:space:]]*$"`
|
||||
|
||||
for dir in $DIRS_TO_ERASE; do
|
||||
vifs_rmdir $dir
|
||||
|
||||
@@ -83,13 +83,15 @@ else
|
||||
$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:]]*$"`
|
||||
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 -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
|
||||
"Cannot create [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk on $DST_HOST"
|
||||
exec_and_log "$VMKFSTOOLS $VI_PARAMS -c ${SIZE}M -d ${VMWARE_DISK_TYPE}\
|
||||
[$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
|
||||
"Cannot create [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk on $DST_HOST"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
@@ -98,11 +98,10 @@ IMAGE_DS_NAME=`basename $(dirname $DST_PATH)`
|
||||
SYSTEM_DS_NAME=`basename $(dirname $(dirname $SRC_PATH))`
|
||||
|
||||
# Paths for disks
|
||||
|
||||
SRC_DISK="/vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$SRC_FOLDER/disk.vmdk"
|
||||
SRC_DISK="$SRC_PATH/disk.vmdk"
|
||||
SRC_DISK_VMW="[$SYSTEM_DS_NAME]$VMID/$SRC_FOLDER/disk.vmdk"
|
||||
|
||||
DST_DISK="/vmfs/volumes/$IMAGE_DS_NAME/$DST_FOLDER/disk.vmdk"
|
||||
DST_DISK="$DST_PATH/disk.vmdk"
|
||||
DST_DISK_VMW="[$IMAGE_DS_NAME]$DST_FOLDER/disk.vmdk"
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
Reference in new issue
Block a user