From 0921cfd3436017ae0110546ea394bec75020e263 Mon Sep 17 00:00:00 2001
From: lsimngar <Alvaro.SimonGarcia@UGent.be>
Date: Mon, 11 Aug 2014 14:54:35 +0200
Subject: [PATCH 1/2] Modified 2 lines and rados command to take into account
 the POOL_NAME and CEPH_USER from the datastore template. At this moment all
 Ceph remotes are using Ceph admin privileges. This could be a sec. issue,
 CEPH_USER should be a mandatory param into Ceph datastores and it should be
 used by Ceph remotes by default.

---
 src/datastore_mad/remotes/ceph/clone   | 11 +++++++++--
 src/datastore_mad/remotes/ceph/cp      | 14 +++++++++++---
 src/datastore_mad/remotes/ceph/mkfs    | 15 +++++++++++----
 src/datastore_mad/remotes/ceph/monitor | 11 +++++++++--
 src/datastore_mad/remotes/ceph/rm      | 12 ++++++++++--
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/clone b/src/datastore_mad/remotes/ceph/clone
index 1fc1b318306..8ce58e6828a 100755
--- a/src/datastore_mad/remotes/ceph/clone
+++ b/src/datastore_mad/remotes/ceph/clone
@@ -48,7 +48,8 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
                     /DS_DRIVER_ACTION_DATA/IMAGE/PATH \
-                    /DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
+                    /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
 
 unset i
 
@@ -57,6 +58,7 @@ BRIDGE_LIST="${XPATH_ELEMENTS[i++]}"
 POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}"
 SRC="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
+CEPH_USER="${XPATH_ELEMENTS[i++]}"
 
 DST_HOST=`get_destination_host $ID`
 
@@ -65,12 +67,17 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
+if [ -z "$CEPH_USER" ]; then
+    error_message "Datastore template missing 'CEPH_USER' attribute."
+    exit -1
+fi
+
 SAFE_DIRS=""
 
 IMAGE_NAME="one-${ID}"
 RBD_DST="${POOL_NAME}/${IMAGE_NAME}"
 
-ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST" \
+ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST --id ${CEPH_USER}" \
                  "Error cloning $SRC to $RBD_DST in $DST_HOST"
 
 echo "$RBD_DST"
diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index a7c8865c1fa..27c38e96569 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -60,7 +60,8 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
                     /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
 
 unset i
 
@@ -77,6 +78,7 @@ MD5="${XPATH_ELEMENTS[i++]}"
 SHA1="${XPATH_ELEMENTS[i++]}"
 NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
+CEPH_USER="${XPATH_ELEMENTS[i++]}"
 
 DST_HOST=`get_destination_host $ID`
 
@@ -85,6 +87,12 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
+if [ -z "$CEPH_USER" ]; then
+    error_message "Datastore template missing 'CEPH_USER' attribute."
+    exit -1
+fi
+
+
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
 IMAGE_HASH=`generate_image_hash`
@@ -134,7 +142,7 @@ REGISTER_CMD=$(cat <<EOF
         mv $TMP_DST.raw $TMP_DST
     fi
 
-    $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
+    $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
 
     # remove original
     $RM -f $TMP_DST
@@ -142,6 +150,6 @@ EOF
 )
 
 ssh_exec_and_log    "$DST_HOST" "$REGISTER_CMD" \
-                    "Error registering $RBD_SOURCE in $DST_HOST"
+                    "Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
 
 echo "$RBD_SOURCE"
diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs
index 17b5f570407..91269865081 100755
--- a/src/datastore_mad/remotes/ceph/mkfs
+++ b/src/datastore_mad/remotes/ceph/mkfs
@@ -54,7 +54,8 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RBD_FORMAT \
                     /DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE \
-                    /DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
+                    /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
 
 unset i
 
@@ -67,6 +68,7 @@ STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}"
 RBD_FORMAT="${XPATH_ELEMENTS[i++]:-$RBD_FORMAT}"
 FSTYPE="${XPATH_ELEMENTS[i++]}"
 SIZE="${XPATH_ELEMENTS[i++]}"
+CEPH_USER="${XPATH_ELEMENTS[i++]}"
 
 DST_HOST=`get_destination_host $ID`
 
@@ -75,6 +77,11 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
+if [ -z "$CEPH_USER" ]; then
+    error_message "Datastore template missing 'CEPH_USER' attribute."
+    exit -1
+fi
+
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
 IMAGE_HASH=`generate_image_hash`
@@ -103,14 +110,14 @@ REGISTER_CMD=$(cat <<EOF
     export PATH=/usr/sbin:/sbin:\$PATH
 
     if [ "$FSTYPE" = "raw" ]; then
-        $RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE}
+        $RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE} --id ${CEPH_USER}
     else
         # create and format
         $DD if=/dev/zero of=$TMP_DST bs=1 count=1 seek=${SIZE}M
         $MKFS_CMD
 
         # create rbd
-        $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
+        $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
 
         # remove original
         $RM -f $TMP_DST
@@ -119,6 +126,6 @@ EOF
 )
 
 ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" \
-    "Error registering $RBD_SOURCE in $DST_HOST"
+    "Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
 
 echo "$RBD_SOURCE"
diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor
index 0b55946061c..b39fbf7782f 100755
--- a/src/datastore_mad/remotes/ceph/monitor
+++ b/src/datastore_mad/remotes/ceph/monitor
@@ -46,10 +46,12 @@ unset i j XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
 
 BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
 POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
 
 HOST=`get_destination_host`
 
@@ -58,10 +60,15 @@ if [ -z "$HOST" ]; then
     exit -1
 fi
 
+if [ -z "$CEPH_USER" ]; then
+    error_message "Datastore template missing 'CEPH_USER' attribute."
+    exit -1
+fi
+
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
-$RADOS df | $AWK '{
+$RADOS df -p ${POOL_NAME} --id ${CEPH_USER}| $AWK '{
     if (\$1 == "total") {
 
         space = int(\$3/1024)
diff --git a/src/datastore_mad/remotes/ceph/rm b/src/datastore_mad/remotes/ceph/rm
index d39b1198c12..4dc6b60dbc2 100755
--- a/src/datastore_mad/remotes/ceph/rm
+++ b/src/datastore_mad/remotes/ceph/rm
@@ -45,10 +45,12 @@ unset i j XPATH_ELEMENTS
 while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
-                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST)
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CEPH_USER)
 
 SRC="${XPATH_ELEMENTS[j++]}"
 BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
 
 DST_HOST=`get_destination_host $ID`
 
@@ -57,10 +59,16 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
+if [ -z "$CEPH_USER" ]; then
+     error_message "Datastore template missing 'CEPH_USER' attribute."
+     exit -1
+fi
+
+
 # -------- Remove Image from Datastore ------------
 
 log "Removing $SRC from the rbd image repository in $DST_HOST"
 
-ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC" "Error removing $SRC in $DST_HOST"
+ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC --id ${CEPH_USER}" "Error removing $SRC in $DST_HOST"
 
 exit 0

From 710decc91c7ef6f979d95e1475073c62e29ec803 Mon Sep 17 00:00:00 2001
From: lsimngar <Alvaro.SimonGarcia@UGent.be>
Date: Thu, 14 Aug 2014 11:34:32 +0200
Subject: [PATCH 2/2] Included CEPH_USER variable if set is used by ceph tm and
 datastore scripts

---
 src/datastore_mad/remotes/ceph/clone   |  8 ++++----
 src/datastore_mad/remotes/ceph/cp      | 10 ++++------
 src/datastore_mad/remotes/ceph/mkfs    | 11 +++++------
 src/datastore_mad/remotes/ceph/monitor |  7 +++----
 src/datastore_mad/remotes/ceph/rm      |  7 +++----
 src/tm_mad/ceph/clone                  | 22 +++++++++++++++++++++-
 src/tm_mad/ceph/cpds                   |  9 ++++++++-
 src/tm_mad/ceph/delete                 | 10 ++++++++--
 src/tm_mad/ceph/mvds                   | 10 ++++++++--
 9 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/src/datastore_mad/remotes/ceph/clone b/src/datastore_mad/remotes/ceph/clone
index 8ce58e6828a..9402cdc878a 100755
--- a/src/datastore_mad/remotes/ceph/clone
+++ b/src/datastore_mad/remotes/ceph/clone
@@ -67,9 +67,8 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
-if [ -z "$CEPH_USER" ]; then
-    error_message "Datastore template missing 'CEPH_USER' attribute."
-    exit -1
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
 fi
 
 SAFE_DIRS=""
@@ -77,7 +76,8 @@ SAFE_DIRS=""
 IMAGE_NAME="one-${ID}"
 RBD_DST="${POOL_NAME}/${IMAGE_NAME}"
 
-ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST --id ${CEPH_USER}" \
+ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC $RBD_DST" \
                  "Error cloning $SRC to $RBD_DST in $DST_HOST"
 
+
 echo "$RBD_DST"
diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp
index 27c38e96569..3603a9ebca1 100755
--- a/src/datastore_mad/remotes/ceph/cp
+++ b/src/datastore_mad/remotes/ceph/cp
@@ -87,12 +87,10 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
-if [ -z "$CEPH_USER" ]; then
-    error_message "Datastore template missing 'CEPH_USER' attribute."
-    exit -1
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
 fi
 
-
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
 IMAGE_HASH=`generate_image_hash`
@@ -142,7 +140,7 @@ REGISTER_CMD=$(cat <<EOF
         mv $TMP_DST.raw $TMP_DST
     fi
 
-    $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
+    $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
 
     # remove original
     $RM -f $TMP_DST
@@ -150,6 +148,6 @@ EOF
 )
 
 ssh_exec_and_log    "$DST_HOST" "$REGISTER_CMD" \
-                    "Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
+                    "Error registering $RBD_SOURCE in $DST_HOST"
 
 echo "$RBD_SOURCE"
diff --git a/src/datastore_mad/remotes/ceph/mkfs b/src/datastore_mad/remotes/ceph/mkfs
index 91269865081..3977c93b047 100755
--- a/src/datastore_mad/remotes/ceph/mkfs
+++ b/src/datastore_mad/remotes/ceph/mkfs
@@ -77,9 +77,8 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
-if [ -z "$CEPH_USER" ]; then
-    error_message "Datastore template missing 'CEPH_USER' attribute."
-    exit -1
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
 fi
 
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
@@ -110,14 +109,14 @@ REGISTER_CMD=$(cat <<EOF
     export PATH=/usr/sbin:/sbin:\$PATH
 
     if [ "$FSTYPE" = "raw" ]; then
-        $RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE} --id ${CEPH_USER}
+        $RBD create $FORMAT_OPT $RBD_SOURCE --size ${SIZE}
     else
         # create and format
         $DD if=/dev/zero of=$TMP_DST bs=1 count=1 seek=${SIZE}M
         $MKFS_CMD
 
         # create rbd
-        $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE --id ${CEPH_USER}
+        $RBD import $FORMAT_OPT $TMP_DST $RBD_SOURCE
 
         # remove original
         $RM -f $TMP_DST
@@ -126,6 +125,6 @@ EOF
 )
 
 ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" \
-    "Error registering $RBD_SOURCE:id=${CEPH_USER} in $DST_HOST"
+    "Error registering $RBD_SOURCE in $DST_HOST"
 
 echo "$RBD_SOURCE"
diff --git a/src/datastore_mad/remotes/ceph/monitor b/src/datastore_mad/remotes/ceph/monitor
index b39fbf7782f..4682ebe4f4e 100755
--- a/src/datastore_mad/remotes/ceph/monitor
+++ b/src/datastore_mad/remotes/ceph/monitor
@@ -60,15 +60,14 @@ if [ -z "$HOST" ]; then
     exit -1
 fi
 
-if [ -z "$CEPH_USER" ]; then
-    error_message "Datastore template missing 'CEPH_USER' attribute."
-    exit -1
+if [ -n "$CEPH_USER" ]; then
+    RADOS="$RADOS --id ${CEPH_USER}"
 fi
 
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
-$RADOS df -p ${POOL_NAME} --id ${CEPH_USER}| $AWK '{
+$RADOS df -p ${POOL_NAME}| $AWK '{
     if (\$1 == "total") {
 
         space = int(\$3/1024)
diff --git a/src/datastore_mad/remotes/ceph/rm b/src/datastore_mad/remotes/ceph/rm
index 4dc6b60dbc2..32d7f7498a7 100755
--- a/src/datastore_mad/remotes/ceph/rm
+++ b/src/datastore_mad/remotes/ceph/rm
@@ -59,9 +59,8 @@ if [ -z "$DST_HOST" ]; then
     exit -1
 fi
 
-if [ -z "$CEPH_USER" ]; then
-     error_message "Datastore template missing 'CEPH_USER' attribute."
-     exit -1
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
 fi
 
 
@@ -69,6 +68,6 @@ fi
 
 log "Removing $SRC from the rbd image repository in $DST_HOST"
 
-ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC --id ${CEPH_USER}" "Error removing $SRC in $DST_HOST"
+ssh_exec_and_log "$DST_HOST" "$RBD rm $SRC" "Error removing $SRC in $DST_HOST"
 
 exit 0
diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone
index 6816a65bdfd..0eb0a156aab 100755
--- a/src/tm_mad/ceph/clone
+++ b/src/tm_mad/ceph/clone
@@ -49,14 +49,34 @@ DISK_ID=$(echo $DST|awk -F. '{print $NF}')
 RBD_DST="${SRC_PATH}-${VM_ID}-${DISK_ID}"
 RBD_SNAP="${VM_ID}-${DISK_ID}"
 
+#-------------------------------------------------------------------------------
+# Get Image information
+#-------------------------------------------------------------------------------
+
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+        XPATH_ELEMENTS[i++]="$element"
+        done < <(onevm show -x $VM_ID| $XPATH  \
+                            /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER)
+
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
+
+
 #-------------------------------------------------------------------------------
 # Clone the image
 #-------------------------------------------------------------------------------
 
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+ 
 CLONE_CMD=$(cat <<EOF
     set -e
 
-    RBD_FORMAT=\$(rbd info $SRC_PATH | sed -n 's/.*format: // p')
+    RBD_FORMAT=\$($RBD info $SRC_PATH | sed -n 's/.*format: // p')   
 
     if [ "\$RBD_FORMAT" = "2" ]; then
         $RBD snap create "$SRC_PATH@$RBD_SNAP"
diff --git a/src/tm_mad/ceph/cpds b/src/tm_mad/ceph/cpds
index 95e47c287da..ffbc243cd47 100755
--- a/src/tm_mad/ceph/cpds
+++ b/src/tm_mad/ceph/cpds
@@ -59,10 +59,12 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Copy Image back to the datastore
@@ -74,6 +76,11 @@ else
     RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
 fi
 
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
+
 ssh_exec_and_log "$SRC_HOST" "$RBD copy $RBD_DST $DST" \
                  "Error cloning $RBD_DST to $DST in $SRC_HOST"
 
diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete
index 4e7a0bd3653..f2bd9c8f4a6 100755
--- a/src/tm_mad/ceph/delete
+++ b/src/tm_mad/ceph/delete
@@ -67,16 +67,22 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER)
 
 SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
 
 # No need to delete no cloned images
 if [ "$CLONE" = "NO" ]; then
     exit 0
 fi
 
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
 # cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
 RBD_SRC="${SRC}-${VM_ID}-${DISK_ID}"
 RBD_SNAP="${VM_ID}-${DISK_ID}"
@@ -93,7 +99,7 @@ log "Deleting $DST_PATH"
 DELETE_CMD=$(cat <<EOF
     set -e
 
-    RBD_FORMAT=\$(rbd info $RBD_SRC | sed -n 's/.*format: // p')
+    RBD_FORMAT=\$($RBD info $RBD_SRC | sed -n 's/.*format: // p')
 
     $RBD rm $RBD_SRC
 
diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds
index 8a64f1afe88..207b49622a1 100755
--- a/src/tm_mad/ceph/mvds
+++ b/src/tm_mad/ceph/mvds
@@ -59,16 +59,22 @@ while IFS= read -r -d '' element; do
     XPATH_ELEMENTS[i++]="$element"
 done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER)
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
 CLONE="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
 
 # No need to copy back to datastore no cloned images
 if [ "$CLONE" = "NO" ]; then
     exit 0
 fi
 
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
 # cloned, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
 RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
 RBD_SNAP="${VM_ID}-${DISK_ID}"
@@ -82,7 +88,7 @@ log "Dumping $RBD_DST to $DST"
 DUMP_CMD=$(cat <<EOF
     set -e
 
-    RBD_FORMAT=\$(rbd info $RBD_DST | sed -n 's/.*format: // p')
+    RBD_FORMAT=\$($RBD info $RBD_DST | sed -n 's/.*format: // p')
 
     if [ "\${RBD_FORMAT}" = "2" ]; then
         $RBD flatten $RBD_DST