commit daadf744edfae895da1d254f9d25c9dbe2ae6db0
author John Garbutt <john.garbutt@citrix.com> Fri Apr 27 18:28:28 2012 +0100
committer John Garbutt <john.garbutt@citrix.com> Tue May 22 18:12:43 2012 +0100
tree f91eabf6f2d9980f5d17ca2103af478253a760fd
parent d0e55c859ab2482ea1d85f1c234238a153fe334e

Improvements to DevStack's XenServer scripts

I have ensured:
- template gets re-used on second run
- template includes XenServer tools, and custom user accounts
- take snapshot before first boot, for easy re-run
- make host_ip_iface work with either eth2 or eth3
- make ssh into domU checks looser
- above is all ground work for improved jenkins tests
- added some more comments to make it scripts clearer

Change-Id: I5c45370bf8a1393d669480e196b13f592d29154f

tools/xen/scripts/install-os-vpx.sh

diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh
index fe5e810..7f2f3e6 100755
--- a/tools/xen/scripts/install-os-vpx.sh
+++ b/tools/xen/scripts/install-os-vpx.sh
@@ -19,7 +19,12 @@
 
 set -eux
 
-. /etc/xensource-inventory
+if [ -a /etc/xensource-inventory]
+then
+    . /etc/xensource-inventory
+else
+    . /etc/xcp/inventory
+fi
 
 NAME="XenServer OpenStack VPX"
 DATA_VDI_SIZE="500MiB"