From d037e06f3a276be2f341b4e13b90f906f26f2bcb Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Fri, 8 Jul 2016 13:02:33 +0200 Subject: [PATCH] Fix of an error which caused problem reported on opennebula: http://dev.opennebula.org/issues/4627 --- datastore/emc/clone | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/datastore/emc/clone b/datastore/emc/clone index 9c7768a..e88f29c 100755 --- a/datastore/emc/clone +++ b/datastore/emc/clone @@ -32,7 +32,6 @@ fi DRIVER_PATH=$(dirname $0) source ${DRIVER_PATH}/../libfs.sh source ${DRIVER_PATH}/emc.conf -source ${DRIVER_PATH}/func.sh # -------- Get cp and datastore arguments from OpenNebula core ------------ @@ -42,10 +41,10 @@ ID=$2 XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION" unset i j XPATH_ELEMENTS - + while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/CLONING_ID \ +done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CLI_HOSTNAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CLI_USER \ @@ -63,8 +62,7 @@ BLOCK_SIZE="${XPATH_ELEMENTS[j++]:-$BLOCK_SIZE}" RAID_GROUP_ID="${XPATH_ELEMENTS[j++]}" RAID_GROUP_RAIDLEVEL="${XPATH_ELEMENTS[j++]}" - -NAVISECCLI="/opt/Navisphere/bin/naviseccli -User $CLI_USER -Password $CLI_PASSWORD -Address $CLI_HOSTNAME -Scope 0 " +source ${DRIVER_PATH}/func.sh # Semaphor - LOCK semaphor_on