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

feature #1437: Get the correct bridgelist file

Browse Source
This commit is contained in:
Tino Vazquez 2012-09-11 18:07:34 +02:00
parent fa4634f4d6
commit 7392786781
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/datastore_mad/remotes/vmfs/clone
View File

@ -59,17 +59,18 @@ DS_ID="${XPATH_ELEMENTS[2]}"
SRC="${XPATH_ELEMENTS[3]}"
SRC_FOLDER=`basename $SRC`
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
DST=`generate_image_path`
DST_FOLDER=`basename $DST`
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`
PASSWORD=`echo $(cat $VMWARERC |grep ":password:"|cut -d":" -f 3)`
VI_PARAMS="--server $DST_HOST --username $USERNAME --password $PASSWORD"
fi
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
DST=`generate_image_path`
DST_FOLDER=`basename $DST`
# ------------ Copy the image to the repository -------------
log "Copying local image $SRC to the image repository"

2
src/datastore_mad/remotes/vmfs/cp
View File

@ -70,7 +70,7 @@ SHA1="${XPATH_ELEMENTS[6]}"
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
DST=`generate_image_path`
DST_HOST=`get_destination_host`
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`

2
src/datastore_mad/remotes/vmfs/mkfs
View File

@ -69,7 +69,7 @@ set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK"
DST=`generate_image_path`
DST_DIR=`dirname $DST`
DST_FOLDER_NAME=`basename $DST`
DST_HOST=`get_destination_host`
DST_HOST=`get_destination_host $(dirname $0)`
if [ "$SSH" != "yes" ]; then
USERNAME=`echo $(cat $VMWARERC |grep ":username:"|cut -d":" -f 3)`

2
src/datastore_mad/remotes/vmfs/rm
View File

@ -54,7 +54,7 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
SRC="${XPATH_ELEMENTS[0]}"
DS_NAME="${XPATH_ELEMENTS[1]}"
DST_HOST=`get_destination_host`
DST_HOST=`get_destination_host $(dirname $0)`
FOLDER_TO_ERASE=`dirname SRC`
if [ "$SSH" != "yes" ]; then