openstack/devstack
Code Issues Proposed changes

Some tweaks for xen + devstack.

Browse Source 
* Import functions for git_clone (allows RECLONE for xen plugins)
 * Fix a potential xvas path issue
 * Tweaks to docs

Change-Id: I34f5c57a53884dfe944f3b0eb8896c57e348e389
This commit is contained in:
Anthony Young 2012-03-16 17:01:49 -07:00
parent e347b990ce
commit b3e2f3399c
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/xen/build_domU.sh
View File

@ -10,7 +10,10 @@ fi
# This directory # This directory
TOP_DIR=$(cd $(dirname "$0") && pwd) 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 source xenrc
# Echo commands # Echo commands
@ -134,17 +137,8 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
SR_UUID=`xe sr-list --minimal name-label="Local storage"` SR_UUID=`xe sr-list --minimal name-label="Local storage"`
xe sr-param-set uuid=$SR_UUID other-config:i18n-key=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 # Checkout nova
if [ ! -d $TOP_DIR/nova ]; then git_clone $NOVA_REPO $TOP_DIR/nova $NOVA_BRANCH
env GIT_SSL_NO_VERIFY=true git clone $NOVA_REPO
cd $TOP_DIR/nova
git checkout $NOVA_BRANCH
fi
# Install plugins # Install plugins
cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/ cp -pr $TOP_DIR/nova/plugins/xenserver/xenapi/etc/xapi.d /etc/

2
tools/xen/xenrc
View File

@ -36,7 +36,7 @@ MGT_VLAN=${MGT_VLAN:-101}
MGT_DEV=${MGT_DEV:-eth0} MGT_DEV=${MGT_DEV:-eth0}
# XVA Directory # XVA Directory
XVA_DIR=${XVA_DIR:-xvas} XVA_DIR=${XVA_DIR:-`pwd`/xvas}
# Path to xva file # Path to xva file
XVA=${XVA:-$XVA_DIR/$GUEST_NAME.xva } XVA=${XVA:-$XVA_DIR/$GUEST_NAME.xva }