commit 815c61760ceeb1cb9f4882a5bd1077156a14b0c3
author Jenkins <jenkins@review.openstack.org> Fri Jun 10 01:39:14 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jun 10 01:39:14 2016 +0000
tree 1a094eb961165b66026d79e083e6605e4767c63e
parent 16df80be4004da2d50018b40691c943cd4739b89
parent f179eb7c4798d5058ebbfd1c7b851070f86fd5ac

Merge "Support installing OpenStack on XenServer 7.0"

tools/xen/install_os_domU.sh

diff --git a/tools/xen/install_os_domU.sh b/tools/xen/install_os_domU.sh
index 8b97265..3a61215 100755
--- a/tools/xen/install_os_domU.sh
+++ b/tools/xen/install_os_domU.sh
@@ -183,10 +183,8 @@
         # Copy the tools DEB to the XS web server
         XS_TOOLS_URL="https://github.com/downloads/citrix-openstack/warehouse/xe-guest-utilities_5.6.100-651_amd64.deb"
         ISO_DIR="/opt/xensource/packages/iso"
-        XS_TOOLS_FILE_NAME="xs-tools.deb"
-        XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME"
         if [ -e "$ISO_DIR" ]; then
-            TOOLS_ISO=$(ls -1 $ISO_DIR/xs-tools-*.iso | head -1)
+            TOOLS_ISO=$(ls -1 $ISO_DIR/*-tools-*.iso | head -1)
             TMP_DIR=/tmp/temp.$RANDOM
             mkdir -p $TMP_DIR
             mount -o loop $TOOLS_ISO $TMP_DIR