Don't look for ISO image when only doing wbatch

The current code looks for the installation ISO (and downloads it if
the ISO is missing) even if the user requested that only Windows batch
scripts be written.

With this patch, osbash calls find_install-iso only if it was asked to
build a basedisk on the local machine.

Partial-Bug: 1312764
Implements: blueprint openstack-training-labs
Change-Id: I7af15dcd4fa99671a85a924b23f434303049fcd2
This commit is contained in:
Roger Luethi 2014-06-18 13:39:32 +02:00
parent 0650237a0c
commit a84cf3fd8e

View File

@ -26,7 +26,8 @@ function vm_install_base {
exit 1
fi
INSTALL_ISO=$ISO_DIR/$ISO_NAME
find_install-iso "$ISO_NAME"
# Don't look for ISO image if we are only doing wbatch
${OSBASH:-:} find_install-iso "$ISO_NAME"
fi
echo >&2 -e "Install ISO:\n\t$INSTALL_ISO"