openstack/devstack
Code Issues Proposed changes

Source fixup_stuff...

Browse Source 
...so it can pick up config variables from local.conf

Change-Id: I0991f59881f16c72789e3b0342c26a2419ba0878
This commit is contained in:
Dean Troyer 2014-08-15 14:03:52 -05:00
parent 5dd1778909
commit 04a351133a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stack.sh
View File

@ -662,7 +662,7 @@ if [[ "$OFFLINE" != "True" ]]; then
fi fi
# Do the ugly hacks for broken packages and distros # Do the ugly hacks for broken packages and distros
$TOP_DIR/tools/fixup_stuff.sh source $TOP_DIR/tools/fixup_stuff.sh
# Extras Pre-install # Extras Pre-install

24
tools/fixup_stuff.sh
View File

@ -20,20 +20,24 @@
# - pre-install hgtools to work around a bug in RHEL6 distribute # - pre-install hgtools to work around a bug in RHEL6 distribute
# - install nose 1.1 from EPEL # - install nose 1.1 from EPEL
set -o errexit # If TOP_DIR is set we're being sourced rather than running stand-alone
set -o xtrace # or in a sub-shell
if [[ -z "$TOP_DIR" ]]; then
set -o errexit
set -o xtrace
# Keep track of the current directory # Keep track of the current directory
TOOLS_DIR=$(cd $(dirname "$0") && pwd) TOOLS_DIR=$(cd $(dirname "$0") && pwd)
TOP_DIR=$(cd $TOOLS_DIR/..; pwd) TOP_DIR=$(cd $TOOLS_DIR/..; pwd)
# Change dir to top of devstack # Change dir to top of devstack
cd $TOP_DIR cd $TOP_DIR
# Import common functions # Import common functions
source $TOP_DIR/functions source $TOP_DIR/functions
FILES=$TOP_DIR/files FILES=$TOP_DIR/files
fi
# Keystone Port Reservation # Keystone Port Reservation
# ------------------------- # -------------------------