From 2aeb0353ac02b8a5e44ce948ffea91cdf0fcceba Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 7 Feb 2014 12:39:48 +0100 Subject: [PATCH] Feature #2568: Fetch RBD format attribute from the VM in the TM scripts --- share/etc/oned.conf | 1 + src/tm_mad/ceph/clone | 15 +++++++++++++++ src/tm_mad/ceph/delete | 4 +++- src/tm_mad/ceph/mvds | 4 +++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/share/etc/oned.conf b/share/etc/oned.conf index 18eb97706f..28abcbff7f 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -734,5 +734,6 @@ IMAGE_RESTRICTED_ATTR = "SOURCE" INHERIT_DATASTORE_ATTR = "CEPH_HOST" INHERIT_DATASTORE_ATTR = "CEPH_SECRET" INHERIT_DATASTORE_ATTR = "CEPH_USER" +INHERIT_DATASTORE_ATTR = "RBD_FORMAT" INHERIT_VNET_ATTR = "VLAN_TAGGED_ID" diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone index f7632c9af2..4b819a50fd 100755 --- a/src/tm_mad/ceph/clone +++ b/src/tm_mad/ceph/clone @@ -49,6 +49,21 @@ 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]/RBD_FORMAT) + +RBD_FORMAT="${XPATH_ELEMENTS[j++]}" + #------------------------------------------------------------------------------- # Clone the image #------------------------------------------------------------------------------- diff --git a/src/tm_mad/ceph/delete b/src/tm_mad/ceph/delete index 4c2833fe5b..f8cbf8333c 100755 --- a/src/tm_mad/ceph/delete +++ b/src/tm_mad/ceph/delete @@ -67,10 +67,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]/PERSISTENT) + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT \ + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/RBD_FORMAT) SRC="${XPATH_ELEMENTS[j++]}" PERSISTENT="${XPATH_ELEMENTS[j++]}" +RBD_FORMAT="${XPATH_ELEMENTS[j++]}" # Exit if persistent [ -n "$PERSISTENT" ] && exit 0 diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds index 7ed60d6b45..b2648df00b 100755 --- a/src/tm_mad/ceph/mvds +++ b/src/tm_mad/ceph/mvds @@ -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]/PERSISTENT) + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT \ + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/RBD_FORMAT) RBD_SRC="${XPATH_ELEMENTS[j++]}" PERSISTENT="${XPATH_ELEMENTS[j++]}" +RBD_FORMAT="${XPATH_ELEMENTS[j++]}" # Exit if persistent [ -n "$PERSISTENT" ] && exit 0