From c0e451c5e95cf91077fa379c355b3cbe3c058d26 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vholer@opennebula.org>
Date: Mon, 4 Sep 2017 11:15:10 +0200
Subject: [PATCH] B #5341: Missing SOURCE for RBD volatile disks

---
 src/tm_mad/ceph/resize | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/tm_mad/ceph/resize b/src/tm_mad/ceph/resize
index 572b7ea544..249ec6f048 100755
--- a/src/tm_mad/ceph/resize
+++ b/src/tm_mad/ceph/resize
@@ -63,18 +63,24 @@ done < <(onevm show -x $VM_ID| $XPATH \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_KEY \
                     /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_CONF \
-                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT)
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/POOL_NAME )
 
 RBD_SRC="${XPATH_ELEMENTS[j++]}"
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
 CEPH_KEY="${XPATH_ELEMENTS[j++]}"
 CEPH_CONF="${XPATH_ELEMENTS[j++]}"
 PERSISTENT="${XPATH_ELEMENTS[j++]}"
+POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
 
-if [[ $PERSISTENT == "YES" ]] ; then \
-  RBD_DST=$RBD_SRC
+if [ -n "${RBD_SRC}" ]; then
+    if [ "${PERSISTENT}" = 'YES' ]; then
+        RBD_DST=$RBD_SRC
+    else
+        RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
+    fi
 else
-  RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
+    RBD_DST="${POOL_NAME}/one-sys-${VM_ID}-${DISK_ID}"
 fi
 
 #-------------------------------------------------------------------------------