mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
feature #1437: Get the correct bridgelist file
This commit is contained in:
1 parent
fa4634f4d6
commit
7392786781
4 files changed
+9
-8
No files matched your search
@@ -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"
|
||||
|
||||
@@ -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)`
|
||||
|
||||
@@ -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)`
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user