From 125e72e2996bd1c77a4a54793afad3c1c76f470a Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Sun, 24 Aug 2014 11:33:03 +0200
Subject: [PATCH] labs: fix guest-additions download

If the VirtualBox guest-additions have to be downloaded from the
Internet (usually they are provided by VirtualBox or already on the
disk), osbash fails to find the ISO image immediately -- it needs to
be restarted for that.

With this patch, osbash will correctly detect a freshly downloaded ISO
image.

Change-Id: Id767525cb25a2953e32ca5cba95fedddcdab6a5e
Implements: blueprint openstack-training-labs
---
 labs/lib/osbash/virtualbox.functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/labs/lib/osbash/virtualbox.functions b/labs/lib/osbash/virtualbox.functions
index c463fe04..cc8b0b74 100644
--- a/labs/lib/osbash/virtualbox.functions
+++ b/labs/lib/osbash/virtualbox.functions
@@ -491,7 +491,7 @@ function _download_guestadd-iso {
         local URL="http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso"
         download "$URL" "$ISO_DIR" $ISO
     fi
-    GUESTADD_ISO="$ISO_DIR/$ISO"
+    echo "$ISO_DIR/$ISO"
 }
 
 function _get_guestadd-iso {
@@ -517,7 +517,7 @@ function _get_guestadd-iso {
     fi
 
     echo >&2 "Looking on the Internet"
-    _download_guestadd-iso
+    ADD_ISO=$(_download_guestadd-iso)
     if [ -f "$ADD_ISO" ]; then
         echo "$ADD_ISO"
         return 0