From a84cf3fd8eee9fd01a9f5fbe63b990a25d8ddc26 Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Wed, 18 Jun 2014 13:39:32 +0200
Subject: [PATCH] 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
---
 labs/lib/osbash/virtualbox.install_base | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/labs/lib/osbash/virtualbox.install_base b/labs/lib/osbash/virtualbox.install_base
index b7589948..966fccb9 100644
--- a/labs/lib/osbash/virtualbox.install_base
+++ b/labs/lib/osbash/virtualbox.install_base
@@ -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"