Feature #2568: Fetch RBD format attribute from the VM in the TM scripts

This commit is contained in:
Jaime Melis committed 2014-02-07 12:39:48 +01:00
1 parent 7ca6b0d78a
commit 2aeb0353ac
4 files changed
+22 -2

No files matched your search

+1
View File
@@ -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"
+15
View File
@@ -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
#-------------------------------------------------------------------------------
+3 -1
View File
@@ -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
+3 -1
View File
@@ -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