Multiple vpx for xen, post splitting of script
Ensure building, installing multiple nova vms works after we
split the build script as build nova vm, install nova vm.
Change-Id: Iadb6e181caec511325a30727bf9e9c79e8afea5a
diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh
index 9aebb13..f0dc3c2 100755
--- a/tools/xen/scripts/install-os-vpx.sh
+++ b/tools/xen/scripts/install-os-vpx.sh
@@ -38,7 +38,7 @@
cat << EOF
Usage: $0 [-f FILE_PATH] [-d DISK_SIZE] [-v BRIDGE_NAME] [-m BRIDGE_NAME] [-p BRIDGE_NAME]
- [-k PARAMS] [-r RAM] [-i|-c] [-w] [-b]
+ [-k PARAMS] [-r RAM] [-i|-c] [-w] [-b] [-l NAME_LABEL]
Installs XenServer OpenStack VPX.
@@ -60,6 +60,7 @@
-k params Specifies kernel parameters.
-r MiB Specifies RAM used by the VPX, in MiB.
By default it will take the value from the XVA.
+ -l name Specifies the name label for the VM.
EXAMPLES:
@@ -87,7 +88,7 @@
get_params()
{
- while getopts "hicwbf:d:v:m:p:k:r:" OPTION;
+ while getopts "hicwbf:d:v:m:p:k:r:l:" OPTION;
do
case $OPTION in
h) usage
@@ -126,6 +127,9 @@
v)
BRIDGE_V=$OPTARG
;;
+ l)
+ NAME_LABEL=$OPTARG
+ ;;
?)
usage
exit
@@ -443,7 +447,7 @@
renumber_system_disk "$vm_uuid"
- nl=$(xe_min vm-list params=name-label uuid=$vm_uuid)
+ nl=${NAME_LABEL:-$(xe_min vm-list params=name-label uuid=$vm_uuid)}
xe vm-param-set \
"name-label=${nl/ import/}" \
other-config:os-vpx=true \