Browse code
Support installing OpenStack on XenServer 7.0
XenServer 7.0 has changed some iso files' name, this made devstack script
install_os_domU.sh failed to install VM before installing OpenStack. This
patch is to fix the problem, make install_os_domU.sh support 7.0 and other
prior versions of XenServer
Change-Id: I49459bfff2b101fc6927eb4578c5eb47cc8c3ad6
Huan Xie authored on 2016/06/02 17:24:22Showing 1 changed files
| ... | ... |
@@ -183,10 +183,8 @@ if [ -z "$templateuuid" ]; then |
| 183 | 183 |
# Copy the tools DEB to the XS web server |
| 184 | 184 |
XS_TOOLS_URL="https://github.com/downloads/citrix-openstack/warehouse/xe-guest-utilities_5.6.100-651_amd64.deb" |
| 185 | 185 |
ISO_DIR="/opt/xensource/packages/iso" |
| 186 |
- XS_TOOLS_FILE_NAME="xs-tools.deb" |
|
| 187 |
- XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME" |
|
| 188 | 186 |
if [ -e "$ISO_DIR" ]; then |
| 189 |
- TOOLS_ISO=$(ls -1 $ISO_DIR/xs-tools-*.iso | head -1) |
|
| 187 |
+ TOOLS_ISO=$(ls -1 $ISO_DIR/*-tools-*.iso | head -1) |
|
| 190 | 188 |
TMP_DIR=/tmp/temp.$RANDOM |
| 191 | 189 |
mkdir -p $TMP_DIR |
| 192 | 190 |
mount -o loop $TOOLS_ISO $TMP_DIR |