Some tweaks for xen + devstack.
* Import functions for git_clone (allows RECLONE for xen plugins)
* Fix a potential xvas path issue
* Tweaks to docs
Change-Id: I34f5c57a53884dfe944f3b0eb8896c57e348e389
diff --git a/tools/xen/build_domU.sh b/tools/xen/build_domU.sh
index 0462796..5fa7aa8 100755
--- a/tools/xen/build_domU.sh
+++ b/tools/xen/build_domU.sh
@@ -10,7 +10,10 @@
# This directory
TOP_DIR=$(cd $(dirname "$0") && pwd)
-# Source params - override xenrc params in your localrc to suite your taste
+# Source lower level functions
+. $TOP_DIR/../../functions
+
+# Source params - override xenrc params in your localrc to suit your taste
source xenrc
# Echo commands
@@ -134,17 +137,8 @@
SR_UUID=`xe sr-list --minimal name-label="Local storage"`
xe sr-param-set uuid=$SR_UUID other-config:i18n-key=local-storage
-# Clean nova if desired
-if [ "$CLEAN" = "1" ]; then
- rm -rf $TOP_DIR/nova
-fi
-
# Checkout nova
-if [ ! -d $TOP_DIR/nova ]; then
- env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
- cd $TOP_DIR/nova
- git checkout $NOVA_BRANCH
-fi
+git_clone $NOVA_REPO $TOP_DIR/nova $NOVA_BRANCH
# Install plugins
cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index 73f9c02..58fda31 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -36,7 +36,7 @@
MGT_DEV=${MGT_DEV:-eth0}
# XVA Directory
-XVA_DIR=${XVA_DIR:-xvas}
+XVA_DIR=${XVA_DIR:-`pwd`/xvas}
# Path to xva file
XVA=${XVA:-$XVA_DIR/$GUEST_NAME.xva }