openstack/devstack
Code Issues Proposed changes

XenAPI: Fix new useage of trueorfalse

Browse Source 
* Ensure that Xen setup scripts will continue to function when unset
  variables are used in stackrc
* Ensure that the generic functions are sourced in all places that xenrc
  (which sources stackrc) is sourced.

Change-Id: I54eba20733c2e149621b74a1387f0bef14fca12e
This commit is contained in:
Bob Ball 2014-02-02 09:16:20 +00:00
parent 78ab80e558
commit c643ebb26d
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/xen/build_xva.sh
View File

@ -21,9 +21,19 @@ set -o xtrace
# This directory
TOP_DIR=$(cd $(dirname "$0") && pwd)
# Source lower level functions
. $TOP_DIR/../../functions
# Include onexit commands
. $TOP_DIR/scripts/on_exit.sh
# xapi functions
. $TOP_DIR/functions
# Determine what system we are running on.
# Might not be XenServer if we're using xenserver-core
GetDistro
# Source params - override xenrc params in your localrc to suite your taste
source xenrc

10
tools/xen/prepare_guest_template.sh
View File

@ -22,9 +22,19 @@ set -o xtrace
# This directory
TOP_DIR=$(cd $(dirname "$0") && pwd)
# Source lower level functions
. $TOP_DIR/../../functions
# Include onexit commands
. $TOP_DIR/scripts/on_exit.sh
# xapi functions
. $TOP_DIR/functions
# Determine what system we are running on.
# Might not be XenServer if we're using xenserver-core
GetDistro
# Source params - override xenrc params in your localrc to suite your taste
source xenrc

3
tools/xen/xenrc
View File

@ -91,4 +91,7 @@ UBUNTU_INST_GATEWAY=""
# Set the size to 0 to avoid creation of additional disk.
XEN_XVDB_SIZE_GB=0
restore_nounset=`set +o | grep nounset`
set +u
source ../../stackrc
$restore_nounset