mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
bug 11858: fake pv : use version in host parameter instead, fix XCP override
status 11858: resolved fixed commit-by: Kevin Brooks review-by: Anthony Xu
This commit is contained in:
parent
09d89b3dc3
commit
f97b3e5c56
@ -18,6 +18,8 @@ fake(){
|
|||||||
/local/domain/${domid}/data/updated 1
|
/local/domain/${domid}/data/updated 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VERSION_RE="\([[:digit:]]\{1,3\}\.\)\{2\}[[:digit:]]\{1,3\}"
|
||||||
|
|
||||||
uuid=$(xe vm-list uuid=$1 params=uuid --minimal)
|
uuid=$(xe vm-list uuid=$1 params=uuid --minimal)
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Argument should be a VM uuid"
|
echo "Argument should be a VM uuid"
|
||||||
@ -25,12 +27,21 @@ if [ $? -ne 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# use the PRODUCT_VERSION from here:
|
# use the INSTALLATION_UUID from here:
|
||||||
. /etc/xensource-inventory
|
. /etc/xensource-inventory
|
||||||
|
|
||||||
major=$(echo ${PRODUCT_VERSION} | cut -f 1 -d .)
|
product_version=$(xe host-list params=software-version uuid="$INSTALLATION_UUID" | \
|
||||||
minor=$(echo ${PRODUCT_VERSION} | cut -f 2 -d .)
|
sed -n -e 's/product_version: \('${VERSION_RE}'\).*/\1/' \
|
||||||
micro=$(echo ${PRODUCT_VERSION} | cut -f 3 -d .)
|
-e 's/^.*\('${VERSION_RE}'\)/\1/p')
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "Failed to get product version"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
major=$(echo $product_version | cut -f 1 -d .)
|
||||||
|
minor=$(echo $product_version | cut -f 2 -d .)
|
||||||
|
micro=$(echo $product_version | cut -f 3 -d .)
|
||||||
|
|
||||||
# Check the VM is running on this host
|
# Check the VM is running on this host
|
||||||
resident_on=$(xe vm-list uuid=${uuid} params=resident-on --minimal)
|
resident_on=$(xe vm-list uuid=${uuid} params=resident-on --minimal)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user